From 48989fc3c8027be3ea470a4afebe575ebb2b5f96 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:06:55 +0200 Subject: [PATCH 01/12] use gh #74 --- .../workflows/trigger_build_pkgdown_site.yaml | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index e9d35ca..53efb7a 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -11,15 +11,21 @@ jobs: trigger-build: runs-on: ubuntu-latest steps: + - name: Install gh + run: | + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 + sudo apt-add-repository https://cli.github.com/packages + sudo apt update + sudo apt install gh + + - name: Configure gh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh auth login --with-token <<< "$GITHUB_TOKEN" + - name: Trigger Build pkgdown site - uses: actions/github-script@v6 - with: - script: | - const workflow_id = "Build pkgdown site"; // The name of the workflow to trigger - const response = await github.actions.createWorkflowDispatch({ - owner: context.repo.owner, - repo: context.repo.repo, - workflow_id, - ref: context.ref, // The branch or tag to run the workflow on - }); - console.log(`Triggered workflow: ${response.data.message}`); + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh workflow run "Build pkgdown site" From 0e6317058bab7cc28d0a55cc2211c27b5189075b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Aug 2024 15:10:39 +0000 Subject: [PATCH 02/12] Increment version [skip ci] --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4faabaf..7f8a33c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: fistools Title: Tools & data used for wildlife management & invasive species in Flanders -Version: 1.2.4 +Version: 1.2.5 Authors@R: c( person(given = "Sander", middle = "", family = "Devisscher", "sander.devisscher@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-2015-5731")), From da7079dd7dc5d7d9952ca4065136c19d3f3480b3 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:15:21 +0200 Subject: [PATCH 03/12] Update trigger_build_pkgdown_site.yaml #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 53efb7a..d517cb5 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -5,24 +5,21 @@ on: workflows: ["Increment version"] # Ensure this matches the name in increment_version.yaml types: - completed - workflow_dispatch: jobs: trigger-build: runs-on: ubuntu-latest steps: - - name: Install gh + - name: Install GitHub CLI run: | - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key C99B11DEB97541F0 - sudo apt-add-repository https://cli.github.com/packages sudo apt update - sudo apt install gh + sudo apt install -y gh - - name: Configure gh + - name: Configure GitHub CLI env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh auth login --with-token <<< "$GITHUB_TOKEN" + echo "$GITHUB_TOKEN" | gh auth login --with-token - name: Trigger Build pkgdown site env: From 979877004d2c6e1aff02bf3620422196a36ef360 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:17:04 +0200 Subject: [PATCH 04/12] add workflow_dispatch #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index d517cb5..9eba6a3 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -5,6 +5,7 @@ on: workflows: ["Increment version"] # Ensure this matches the name in increment_version.yaml types: - completed + workflow_dispatch: jobs: trigger-build: From d6f35e822f3e150885a47696b0af39433dfa3fcd Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:20:34 +0200 Subject: [PATCH 05/12] rework auth #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 9eba6a3..42b4d5a 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -17,13 +17,9 @@ jobs: sudo apt install -y gh - name: Configure GitHub CLI - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - echo "$GITHUB_TOKEN" | gh auth login --with-token + run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token - name: Trigger Build pkgdown site + run: gh workflow run "Build pkgdown site" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh workflow run "Build pkgdown site" From 689b42b87cf4e6407a32b8ed4a8baf98f17c9c15 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:22:54 +0200 Subject: [PATCH 06/12] add checkout #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 42b4d5a..2d7da0e 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -11,6 +11,9 @@ jobs: trigger-build: runs-on: ubuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Install GitHub CLI run: | sudo apt update From 17efa08eb119fc5ef1a0f1f115a2b10aec8cb521 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:30:07 +0200 Subject: [PATCH 07/12] Update trigger_build_pkgdown_site.yaml #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 2d7da0e..3cd73d6 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -22,7 +22,8 @@ jobs: - name: Configure GitHub CLI run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token - - name: Trigger Build pkgdown site - run: gh workflow run "Build pkgdown site" + - name: Trigger Build pkgdown site + run: | + gh workflow run "Build pkgdown site" --ref ${{ github.head_ref }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0412c9ebc904ce2e0df6a3afffde3feb4af9916e Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:31:11 +0200 Subject: [PATCH 08/12] indent #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 3cd73d6..3d975bf 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -22,7 +22,7 @@ jobs: - name: Configure GitHub CLI run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token - - name: Trigger Build pkgdown site + - name: Trigger Build pkgdown site run: | gh workflow run "Build pkgdown site" --ref ${{ github.head_ref }} env: From 3914fdab36c68639b0628b21a8a1eb21fa36663b Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:34:33 +0200 Subject: [PATCH 09/12] Update trigger_build_pkgdown_site.yaml #76 --- .github/workflows/trigger_build_pkgdown_site.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/trigger_build_pkgdown_site.yaml b/.github/workflows/trigger_build_pkgdown_site.yaml index 3d975bf..47f20eb 100644 --- a/.github/workflows/trigger_build_pkgdown_site.yaml +++ b/.github/workflows/trigger_build_pkgdown_site.yaml @@ -24,6 +24,8 @@ jobs: - name: Trigger Build pkgdown site run: | - gh workflow run "Build pkgdown site" --ref ${{ github.head_ref }} + # Extract the branch name from the full reference + BRANCH_NAME=${GITHUB_REF##*/} + gh workflow run "Build pkgdown site" --ref "$BRANCH_NAME" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3aecf7b360acea96ea8fa272e1641345e3e6b230 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 17:42:44 +0200 Subject: [PATCH 10/12] Update Build pkgdown site.yaml #76 --- .github/workflows/Build pkgdown site.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml index b18dd99..790b728 100644 --- a/.github/workflows/Build pkgdown site.yaml +++ b/.github/workflows/Build pkgdown site.yaml @@ -2,6 +2,10 @@ name: Build pkgdown site on: workflow_dispatch: # Trigger manually + workflow_run: + workflows: ["Trigger Build pkgdown Site"] + types: + - completed concurrency: group: ${{ github.ref }}-${{ github.workflow }} # Use the branch reference as the concurrency group From 06209cf6c866781e79e18c36f4c146343284ad8d Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 18:37:57 +0200 Subject: [PATCH 11/12] Update Build pkgdown site.yaml #76 --- .github/workflows/Build pkgdown site.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml index 790b728..4638da6 100644 --- a/.github/workflows/Build pkgdown site.yaml +++ b/.github/workflows/Build pkgdown site.yaml @@ -79,9 +79,10 @@ jobs: git add -A if ! git diff --cached --quiet; then git commit -m 'Build pkgdown site [skip ci]' - git pull --rebase origin ${{ github.head_ref }} - git push origin HEAD:${{ github.head_ref }} + # Extract the branch name from the full reference + BRANCH_NAME=${GITHUB_REF##*/} + git pull --rebase origin "$BRANCH_NAME" + git push origin HEAD:"$BRANCH_NAME" else echo "No changes to commit." fi - From 3d17f31af5c250f626281037d09f865ca23bf36d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Aug 2024 17:12:01 +0000 Subject: [PATCH 12/12] Build pkgdown site [skip ci] --- docs/404.html | 2 +- docs/CODE_OF_CONDUCT.html | 2 +- docs/LICENSE-text.html | 2 +- docs/LICENSE.html | 2 +- docs/authors.html | 6 +++--- docs/index.html | 2 +- docs/pkgdown.yml | 2 +- docs/reference/CRS_extracter.html | 2 +- docs/reference/UUID_List.html | 2 +- docs/reference/apply_grtsdb.html | 2 +- docs/reference/boswachterijen.html | 2 +- docs/reference/calculate_polygon_centroid.html | 2 +- docs/reference/check.html | 2 +- docs/reference/cleanup_sqlite.html | 2 +- docs/reference/col_content_compare.html | 2 +- docs/reference/colcompare.html | 2 +- docs/reference/collect_osm_features.html | 2 +- docs/reference/download_dep_media.html | 2 +- docs/reference/download_gdrive_if_missing.html | 2 +- docs/reference/download_seq_media.html | 2 +- docs/reference/drg_example.html | 2 +- docs/reference/index.html | 2 +- docs/reference/install_sp.html | 2 +- docs/reference/label_converter.html | 2 +- docs/reference/label_selecter.html | 2 +- docs/reference/lib_crs.html | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/404.html b/docs/404.html index b863e77..3db0651 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html index e737a58..33d003f 100644 --- a/docs/CODE_OF_CONDUCT.html +++ b/docs/CODE_OF_CONDUCT.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index f077a1c..91f3f13 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index a811a5c..aa64b4b 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/authors.html b/docs/authors.html index ee2bec0..963992e 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 @@ -70,13 +70,13 @@

Citation

Devisscher S, Pallemaerts L, Delva S, Cartuyvels E, Bollen M (2024). fistools: Tools & data used for wildlife management & invasive species in Flanders. -R package version 1.2.2. +R package version 1.2.5. 

@Manual{,
   title = {fistools: Tools & data used for wildlife management & invasive species in Flanders},
   author = {Sander Devisscher and Lynn Pallemaerts and Soria Delva and Emma Cartuyvels and Martijn Bollen},
   year = {2024},
-  note = {R package version 1.2.2},
+  note = {R package version 1.2.5},
 }
diff --git a/docs/index.html b/docs/index.html index 638f98f..93d3b2e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 25c6a7f..acfb3c9 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -2,4 +2,4 @@ pandoc: 2.9.2.1 pkgdown: 2.1.0 pkgdown_sha: ~ articles: {} -last_built: 2024-08-23T09:45Z +last_built: 2024-08-23T17:11Z diff --git a/docs/reference/CRS_extracter.html b/docs/reference/CRS_extracter.html index 49274fe..31d0aa1 100644 --- a/docs/reference/CRS_extracter.html +++ b/docs/reference/CRS_extracter.html @@ -19,7 +19,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/UUID_List.html b/docs/reference/UUID_List.html index d884883..9ffe204 100644 --- a/docs/reference/UUID_List.html +++ b/docs/reference/UUID_List.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/apply_grtsdb.html b/docs/reference/apply_grtsdb.html index 5e77cc0..2ae8618 100644 --- a/docs/reference/apply_grtsdb.html +++ b/docs/reference/apply_grtsdb.html @@ -18,7 +18,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/boswachterijen.html b/docs/reference/boswachterijen.html index 04c3710..231da72 100644 --- a/docs/reference/boswachterijen.html +++ b/docs/reference/boswachterijen.html @@ -18,7 +18,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/calculate_polygon_centroid.html b/docs/reference/calculate_polygon_centroid.html index 3e554c1..a1f4d79 100644 --- a/docs/reference/calculate_polygon_centroid.html +++ b/docs/reference/calculate_polygon_centroid.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/check.html b/docs/reference/check.html index 4f70614..bf8a4be 100644 --- a/docs/reference/check.html +++ b/docs/reference/check.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/cleanup_sqlite.html b/docs/reference/cleanup_sqlite.html index f060ab1..f4d01b7 100644 --- a/docs/reference/cleanup_sqlite.html +++ b/docs/reference/cleanup_sqlite.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/col_content_compare.html b/docs/reference/col_content_compare.html index 4ff85a1..4471a24 100644 --- a/docs/reference/col_content_compare.html +++ b/docs/reference/col_content_compare.html @@ -19,7 +19,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/colcompare.html b/docs/reference/colcompare.html index 98445ba..5feff23 100644 --- a/docs/reference/colcompare.html +++ b/docs/reference/colcompare.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/collect_osm_features.html b/docs/reference/collect_osm_features.html index c8c093b..3b3c10d 100644 --- a/docs/reference/collect_osm_features.html +++ b/docs/reference/collect_osm_features.html @@ -23,7 +23,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/download_dep_media.html b/docs/reference/download_dep_media.html index e2b6d15..2a844cd 100644 --- a/docs/reference/download_dep_media.html +++ b/docs/reference/download_dep_media.html @@ -18,7 +18,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/download_gdrive_if_missing.html b/docs/reference/download_gdrive_if_missing.html index ddd8988..c67bc0a 100644 --- a/docs/reference/download_gdrive_if_missing.html +++ b/docs/reference/download_gdrive_if_missing.html @@ -19,7 +19,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/download_seq_media.html b/docs/reference/download_seq_media.html index 475bbd3..686002c 100644 --- a/docs/reference/download_seq_media.html +++ b/docs/reference/download_seq_media.html @@ -18,7 +18,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/drg_example.html b/docs/reference/drg_example.html index 9aac614..9d1d7a1 100644 --- a/docs/reference/drg_example.html +++ b/docs/reference/drg_example.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/index.html b/docs/reference/index.html index b78c0df..68422f2 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/install_sp.html b/docs/reference/install_sp.html index 9a559ed..14ba7d3 100644 --- a/docs/reference/install_sp.html +++ b/docs/reference/install_sp.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/label_converter.html b/docs/reference/label_converter.html index 1cd96c3..09ffec8 100644 --- a/docs/reference/label_converter.html +++ b/docs/reference/label_converter.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/label_selecter.html b/docs/reference/label_selecter.html index 58233a5..15ea828 100644 --- a/docs/reference/label_selecter.html +++ b/docs/reference/label_selecter.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5 diff --git a/docs/reference/lib_crs.html b/docs/reference/lib_crs.html index fa65c02..391197d 100644 --- a/docs/reference/lib_crs.html +++ b/docs/reference/lib_crs.html @@ -17,7 +17,7 @@ fistools - 1.2.2 + 1.2.5