Merge pull request #71 from inbo/70-bug-small-issues-with-workflows

70 bug small issues with workflows
inbo · Aug 23, 2024 · c34c487 · c34c487
2 parents d95eb58 + 54fc363
commit c34c487
Show file tree

Hide file tree

Showing 30 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.ref }}  # Use the branch reference as the concurrency group
+  group: ${{ github.ref }}-${{ github.workflow }}  # Use the branch reference as the concurrency group
   cancel-in-progress: true    # Cancel any in-progress runs in the same group
 
 jobs:
@@ -63,12 +63,7 @@ jobs:
       run: |
         git config --global user.name 'github-actions[bot]'
         git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-        if ! git diff --cached --quiet; then
-          git pull --rebase origin ${{ github.head_ref }}
-        else
-           echo "No changes to pull."
-        fi
-
+        git pull --rebase origin ${{ github.head_ref }}
 
     - name: Build pkgdown site
       run: pkgdown::build_site()

diff --git a/.github/workflows/increment_version.yaml b/.github/workflows/increment_version.yaml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.ref }}  # Use the branch reference as the concurrency group
+  group: ${{ github.ref }}-${{ github.workflow }}  # Use the branch reference as the concurrency group
   cancel-in-progress: true    # Cancel any in-progress runs in the same group
 
 jobs:

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.1
+Version: 1.2.2
 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-22T12:46Z
+last_built: 2024-08-23T09:45Z
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
diff --git a/preprocessing/increment_version.R b/preprocessing/increment_version.R
@@ -22,8 +22,13 @@ version_remote <- desc_remote$Version
 # get git branch name
 branch <- system("git rev-parse --abbrev-ref HEAD", intern = TRUE)
 
+print(branch)
+
 # Check if new-function or new-dataset is in branch
-if(grepl("new-function", branch) | grepl("new-dataset", branch)){
+if(grepl("new-function", branch) |
+   grepl("new-dataset", branch) |
+   grepl("new function", branch) |
+   grepl("new dataset", branch)){
   type <- "minor"
 }else{
   type <- "patch"