Merge branch 'main' into 23-new-function-aggregate_lineparts_sfr

inbo · Aug 26, 2024 · 5adc1ab · 5adc1ab
2 parents 646e3c7 + fc0edc9
commit 5adc1ab
Show file tree

Hide file tree

Showing 27 changed files with 35 additions and 30 deletions.
diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml
@@ -8,7 +8,7 @@ on:
       - completed
 
 concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}  # Use the branch reference as the concurrency group
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}  # Use the event name, branch reference, and workflow name as the concurrency group
   cancel-in-progress: true    # Cancel any in-progress runs in the same group
 
 jobs:
@@ -31,6 +31,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Debug concurrency group
+      run: |
+        echo "Concurrency group:"
+        echo "${{ github.event_name }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}"
+
     - name: Setup R
       uses: r-lib/actions/setup-r@v2
       with:
@@ -82,7 +87,7 @@ jobs:
           # Extract the branch name from the full reference
           BRANCH_NAME=${GITHUB_REF##*/}
           git pull --rebase origin "$BRANCH_NAME"
-          git push origin HEAD:"$BRANCH_NAME"
+          git push origin "$BRANCH_NAME"  # Push to the correct branch
         else
           echo "No changes to commit."
         fi
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-23T17:11Z
+last_built: 2024-08-26T11:28Z
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