Merge pull request #76 from inbo/74-bug-fix-issues-with-trigger-build…

…-pkgdown-site use gh
inbo · Aug 26, 2024 · f9d0d0f · f9d0d0f
2 parents 0a79ae4 + 3d17f31
commit f9d0d0f
Show file tree

Hide file tree

Showing 29 changed files with 54 additions and 43 deletions.
diff --git 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
@@ -75,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
-
diff --git 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: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install GitHub CLI
+      run: |
+        sudo apt update
+        sudo apt install -y gh
+
+    - name: Configure GitHub CLI
+      run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-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}`);
+      run: |
+        # 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 }}
diff --git 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", "[email protected]", 
       role = c("aut", "cre"), comment = c(ORCID = "0000-0003-2015-5731")),

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git 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
diff --git a/docs/reference/UUID_List.html b/docs/reference/UUID_List.html
diff --git a/docs/reference/apply_grtsdb.html b/docs/reference/apply_grtsdb.html
diff --git a/docs/reference/boswachterijen.html b/docs/reference/boswachterijen.html
diff --git a/docs/reference/calculate_polygon_centroid.html b/docs/reference/calculate_polygon_centroid.html
diff --git a/docs/reference/check.html b/docs/reference/check.html
diff --git a/docs/reference/cleanup_sqlite.html b/docs/reference/cleanup_sqlite.html
diff --git a/docs/reference/col_content_compare.html b/docs/reference/col_content_compare.html
diff --git a/docs/reference/colcompare.html b/docs/reference/colcompare.html
diff --git a/docs/reference/collect_osm_features.html b/docs/reference/collect_osm_features.html
diff --git a/docs/reference/download_dep_media.html b/docs/reference/download_dep_media.html
diff --git a/docs/reference/download_gdrive_if_missing.html b/docs/reference/download_gdrive_if_missing.html
diff --git a/docs/reference/download_seq_media.html b/docs/reference/download_seq_media.html
diff --git a/docs/reference/drg_example.html b/docs/reference/drg_example.html
diff --git a/docs/reference/index.html b/docs/reference/index.html
diff --git a/docs/reference/install_sp.html b/docs/reference/install_sp.html
diff --git a/docs/reference/label_converter.html b/docs/reference/label_converter.html
diff --git a/docs/reference/label_selecter.html b/docs/reference/label_selecter.html
diff --git a/docs/reference/lib_crs.html b/docs/reference/lib_crs.html