Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firebreak bump #1

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9bae4e8
Bump just-the-docs from 0.7.0 to 0.8.2
dependabot[bot] Apr 1, 2024
27e8623
Update README.md
antoniochavez18 May 28, 2024
17a54c8
Merge pull request #16 from fire2a/antoniochavez18-patch-1
antoniochavez18 May 28, 2024
b40de59
first run & update gif
Jun 5, 2024
286eee5
firebreak doc
Jun 5, 2024
0c16079
Merge branch 'main' of github.com:fire2a/docs
Jun 5, 2024
379793d
Merge branch 'main' into main
fdobad Jun 5, 2024
f098c66
fixing translate
Jun 11, 2024
7213f4c
Update README.md
fdobad Jul 10, 2024
b75ae62
built
Jul 17, 2024
85815ff
Merge pull request #14 from fire2a/dependabot/bundler/just-the-docs-0…
fdobad Jul 17, 2024
cefdd27
first test works
Jul 17, 2024
75c2630
all gif to mp4 and references
Jul 17, 2024
843d798
better rebuild instructions
Jul 17, 2024
400217f
ffmpeg commands
Jul 17, 2024
b832d8c
Feature: start/stop/seek gif replaced with videos
fdobad Jul 17, 2024
e61d049
better build guide
Jul 18, 2024
8b0bf9b
install overview
Jul 18, 2024
14abc17
install overview
Jul 18, 2024
b69969e
update
Jul 18, 2024
a785bfb
update video
Jul 18, 2024
cee7d71
toolbox intro
Jul 18, 2024
8520f92
better_live_reload
Jul 18, 2024
0c2e1e3
Merge pull request #20 from fire2a/installing
fdobad Jul 18, 2024
3f7a4d7
Bump just-the-docs from 0.8.2 to 0.9.0
dependabot[bot] Aug 12, 2024
5769257
local_built
Aug 15, 2024
cbc9af2
Merge pull request #21 from fire2a/dependabot/bundler/just-the-docs-0…
fdobad Aug 15, 2024
b16b287
Update README.md
fdobad Sep 6, 2024
4e4aab8
Bump just-the-docs from 0.9.0 to 0.10.0
dependabot[bot] Sep 9, 2024
9fff114
build on debian 12
Nov 20, 2024
a2d1ea6
Merge pull request #22 from fire2a/dependabot/bundler/just-the-docs-0…
fdobad Nov 20, 2024
a6185b3
Polygonize weighted rasters (#25)
fdobad Nov 28, 2024
feefc4e
ros units m/m -> m
Dec 4, 2024
ffc21d8
warninglog
fdobad Dec 5, 2024
a8da5fd
Update README.md
fdobad Dec 13, 2024
ccfb99d
Bump jekyll from 4.3.3 to 4.3.4 (#23)
dependabot[bot] Jan 25, 2025
a6caa63
Podman container (#27)
fdobad Jan 25, 2025
0df23da
Bump just-the-docs from 0.10.0 to 0.10.1 (#26)
dependabot[bot] Jan 25, 2025
fccaf6f
Fixes (#28)
fdobad Jan 27, 2025
c4d0219
fix
fdobad Feb 10, 2025
460efdb
fix actions/upload-pages-artifact@v4 deprecation
fdobad Feb 10, 2025
0051447
fix workflow deprecation
fdobad Feb 10, 2025
982e625
fix version
fdobad Feb 10, 2025
ff3367c
dizzy
fdobad Feb 10, 2025
0890ea2
fix workflows
fdobad Feb 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
version: 2
updates:
- package-ecosystem: bundler
directory: /
- package-ecosystem: "bundler"
directory: "/site"
schedule:
interval: daily
interval: "weekly"
allow:
- dependency-type: direct
- dependency-type: "direct"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: CI

on:
push:
branches: ["main"]
# push:
# branches: ["main"]
pull_request:

jobs:
Expand All @@ -19,4 +19,4 @@ jobs:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Build with Jekyll
run: bundle exec jekyll build
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
12 changes: 9 additions & 3 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
# Build job
build:
runs-on: ubuntu-latest
defaults:
run:
working-directory: site
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -37,17 +40,20 @@ jobs:
ruby-version: '3.1' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
working-directory: '${{ github.workspace }}/site'
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Build with Jekyll
# Outputs to the './_site' directory by default
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
env:
JEKYLL_ENV: production
- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: "site/_site/"

# Deployment job
deploy:
Expand All @@ -59,4 +65,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v4
22 changes: 22 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM debian:stable

ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y \
ruby-full \
ruby-bundler \
jekyll \
build-essential \
git \
vim-tiny

COPY serve.sh /serve.sh
RUN chmod +x /serve.sh

COPY build_n_serve.sh /build_n_serve.sh
RUN chmod +x /build_n_serve.sh

EXPOSE 4000 35729

CMD ["/build_n_serve.sh"]
File renamed without changes.
80 changes: 55 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,68 @@
# Fire2a documentation repo
# Fire2a user documentation webpage

This repo uses the [just-the-docs-template](https://github.com/just-the-docs/just-the-docs-template) Jekyl Pages action.
The source for its content is in the docs directory.
Check the live [page](https://fire2a.github.io/docs/).
This "GitHub Pages" hosted page is published [here](https://fire2a.github.io/docs/)

## About Us
Using [just-the-docs-template](https://github.com/just-the-docs/just-the-docs-template) Jekyll Pages action

We are a research group that seeks solutions to complex problems arising from the terrestrial ecosystem and its natural and anthropogenic disturbances,such as wildfires.
The content is located in `site` directory, and it is mainly just markdown files

Currently hosted at [ISCI](https://isci.cl) offices.
## Contributing
Please feel free to contribute by opening a pull request, to preview your changes locally, you can use the following methods:

Contact us at <a href="mailto:[email protected]">[email protected]</a>.
### Container
This setup will build the Jekyll site inside the container and serve it with live reload enabled.

[content licence](./LICENCE)
[just-the-docs-licence](./just-the-docs-LICENCE)
You can access the site at `http://localhost:4000` after running the container.
```bash
sudo apt install podman

## local hosting on debian
### install
# build the container named fire2a_docs
podman build -t fire2a_docs .

sudo apt-get install ruby-full ruby-bundler jekyll build-essential
cd repo/root/
bundle config set --local path 'vendor/bundle'
bundle install
# build_n_serve.sh is the default command
podman run -it --rm -v ./site:/app -p 35729:35729 -p 4000:4000 fire2a_docs

### serve
# or just serve (after build)
podman run -it --rm -v $(pwd):/app -p 35729:35729 -p 4000:4000 fire2a_docs /serve.sh
```

bundle exec jekyll serve --livereload
### Local hosting on debian
#### install
```bash
sudo apt-get install ruby-full ruby-bundler jekyll build-essential
```
#### build
```
cd <repo/root>
bundle config set --local path 'vendor/bundle'
bundle install
```
#### live serve
Editing and saving will automatically update the page.
```bash
bundle exec jekyll serve --livereload
...
LiveReload address: http://127.0.0.1:35729
Server address: http://127.0.0.1:4000 <--- OPEN IN BROWSER
Server running... press ctrl-c to stop.
```

# ctrl+click here to open
...
Server address: http://127.0.0.1:4000
...
## update just-the-docs dependencies
Dependabot will automatically create a pull request to update the just-the-docs version.
```bash
git switch dependabot/bundler/just-the-docs-0.8.2
# check compatibility
ruby -v
node -v
# clean
git clean -dfX -n
rm Gemfile.lock
rm -r .bundle vendor/bundle
bundle clean --force
# rebuild
```

### references
https://github.com/just-the-docs/just-the-docs
https://jekyllrb.com/docs/installation/other-linux/
## references
https://github.com/just-the-docs/just-the-docs
https://jekyllrb.com/docs/installation/other-linux/

11 changes: 11 additions & 0 deletions build_n_serve.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash
set -x

cd /app
# git clean -dfX # messes unchanged files
rm -f Gemfile.lock
rm -fr .bundle vendor/bundle
bundle clean --force
bundle config set --local path 'vendor/bundle'
bundle install
bundle exec jekyll serve --livereload --host 0.0.0.0 --force_polling
37 changes: 37 additions & 0 deletions convert.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash

# 1
# Find all .gif files recursively from the current directory
find . -type f -name "*.gif" | while read -r gif_file; do
# Extract the base name without the extension
base_name="${gif_file%.*}"

# Define the new filename with .mp4 extension
mp4_file="${base_name}.mp4"

# Use ffmpeg to convert the gif to mp4
echo "Converting $gif_file to $mp4_file"
# ffmpeg -i "$gif_file" "$mp4_file"
ffmpeg -i $gif_file -movflags faststart -pix_fmt yuv420p -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $mp4_file

echo "Converted $gif_file to $mp4_file"
done

# 2
# manual
gif_file=qgis_windows_activate_venv.gif
base_name="${gif_file%.*}"
mp4_file="${base_name}.mp4"
rm $mp4_file
ffmpeg -i $gif_file -movflags faststart -pix_fmt yuv420p -vf "scale=trunc(iw/2)*2:trunc(ih/2)*2" $mp4_file

# 3
# check
find . -type f -name "*.gif" | while read -r gif_file; do
# Extract the base name without the extension
base_name="${gif_file%.*}"
# Define the new filename with .mp4 extension
mp4_file="${base_name}.mp4"
ls -lh $gif_file $mp4_file
echo "Converted $gif_file to $mp4_file"
done
File renamed without changes.
File renamed without changes.
19 changes: 11 additions & 8 deletions docs/qgis-dialog/README.md → deprecated/qgis-dialog/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
layout: default
title: QGIS dialog DEPRECATED
nav_order: 97
has_children: true
has_toc: false
---
# ---
# layout: default
# title: QGIS dialog DEPRECATED
# nav_order: 97
# has_children: true
# has_toc: false
# ---

# Cell 2 Fire QGIS plugin
{: .no_toc}
Expand Down Expand Up @@ -42,7 +42,10 @@ This softwares enables you to simulate thousand of forest fires on a landscape u
4. [Install the plugin inside QGIS](#activate)

<figure>
<img src="img/win_install_script.gif" width=66% alt='missing'>
<video controls loop style="width: 66%;">
<source src="img/win_install_script.mp4" type="video/mp4">
Your browser does not support the video tag.
</video>
<figcaption>executing installer</figcaption>
</figure>

Expand Down
File renamed without changes
Binary file added deprecated/qgis-dialog/img/win_install_script.mp4
Binary file not shown.
File renamed without changes.
File renamed without changes.
103 changes: 0 additions & 103 deletions docs/Cell2Fire/README.md

This file was deleted.

Loading
Loading