From 4b6161219ba2ee9886349fa5c83a7ece45e0d4c3 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 10:32:21 +0200 Subject: [PATCH 1/6] add version without "-" #70 --- preprocessing/increment_version.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/preprocessing/increment_version.R b/preprocessing/increment_version.R index c657872..4fc7c85 100644 --- a/preprocessing/increment_version.R +++ b/preprocessing/increment_version.R @@ -23,7 +23,10 @@ version_remote <- desc_remote$Version branch <- system("git rev-parse --abbrev-ref HEAD", intern = TRUE) # 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" From d0ffdba1b7bc632d80e923778810c3a1777e6b2c Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 10:34:23 +0200 Subject: [PATCH 2/6] fix concurrency #70 --- .github/workflows/Build pkgdown site.yaml | 2 +- .github/workflows/increment_version.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml index 7c1f1e7..ec572d3 100644 --- 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: diff --git a/.github/workflows/increment_version.yaml b/.github/workflows/increment_version.yaml index 66b0b97..b7b844b 100644 --- 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: From 1da1896dfdd3558cbaaf61d0c36eb4a8490b2125 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 10:37:11 +0200 Subject: [PATCH 3/6] add some feedback #70 --- preprocessing/increment_version.R | 2 ++ 1 file changed, 2 insertions(+) diff --git a/preprocessing/increment_version.R b/preprocessing/increment_version.R index 4fc7c85..b9dd176 100644 --- a/preprocessing/increment_version.R +++ b/preprocessing/increment_version.R @@ -22,6 +22,8 @@ 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) | From fd2f956bc0d6f51db3e031a45563b85ea0324c3a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Aug 2024 08:41:02 +0000 Subject: [PATCH 4/6] Increment version [skip ci] --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 99da7df..962eaab 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.1 +Version: 1.2.2 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 1584ff2f0903f7a7cbfcb906bec4ce583c66ee09 Mon Sep 17 00:00:00 2001 From: Sander Devisscher Date: Fri, 23 Aug 2024 11:12:54 +0200 Subject: [PATCH 5/6] fix rebase #71 --- .github/workflows/Build pkgdown site.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/Build pkgdown site.yaml b/.github/workflows/Build pkgdown site.yaml index ec572d3..30ff088 100644 --- a/.github/workflows/Build pkgdown site.yaml +++ b/.github/workflows/Build pkgdown site.yaml @@ -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() From 54fc363b2737a79e8d9a4a86fbeadfad90adfaad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 23 Aug 2024 09:45:44 +0000 Subject: [PATCH 6/6] 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 738d235..b863e77 100644 --- a/docs/404.html +++ b/docs/404.html @@ -32,7 +32,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html index 15ca0d8..e737a58 100644 --- a/docs/CODE_OF_CONDUCT.html +++ b/docs/CODE_OF_CONDUCT.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 9afe71e..f077a1c 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/LICENSE.html b/docs/LICENSE.html index 8b06e2a..a811a5c 100644 --- a/docs/LICENSE.html +++ b/docs/LICENSE.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/authors.html b/docs/authors.html index bf8d4a0..ee2bec0 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 @@ -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.1. +R package version 1.2.2. 

@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.1},
+  note = {R package version 1.2.2},
 }
diff --git a/docs/index.html b/docs/index.html index ad5f753..638f98f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index ee68c80..25c6a7f 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-22T12:46Z +last_built: 2024-08-23T09:45Z diff --git a/docs/reference/CRS_extracter.html b/docs/reference/CRS_extracter.html index 4ee2b5c..49274fe 100644 --- a/docs/reference/CRS_extracter.html +++ b/docs/reference/CRS_extracter.html @@ -19,7 +19,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/UUID_List.html b/docs/reference/UUID_List.html index ff1eacc..d884883 100644 --- a/docs/reference/UUID_List.html +++ b/docs/reference/UUID_List.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/apply_grtsdb.html b/docs/reference/apply_grtsdb.html index 4e9dd76..5e77cc0 100644 --- a/docs/reference/apply_grtsdb.html +++ b/docs/reference/apply_grtsdb.html @@ -18,7 +18,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/boswachterijen.html b/docs/reference/boswachterijen.html index d1e7924..04c3710 100644 --- a/docs/reference/boswachterijen.html +++ b/docs/reference/boswachterijen.html @@ -18,7 +18,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/calculate_polygon_centroid.html b/docs/reference/calculate_polygon_centroid.html index dd006e2..3e554c1 100644 --- a/docs/reference/calculate_polygon_centroid.html +++ b/docs/reference/calculate_polygon_centroid.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/check.html b/docs/reference/check.html index c6bd2e3..4f70614 100644 --- a/docs/reference/check.html +++ b/docs/reference/check.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/cleanup_sqlite.html b/docs/reference/cleanup_sqlite.html index 78ce3d8..f060ab1 100644 --- a/docs/reference/cleanup_sqlite.html +++ b/docs/reference/cleanup_sqlite.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/col_content_compare.html b/docs/reference/col_content_compare.html index 731f7d3..4ff85a1 100644 --- a/docs/reference/col_content_compare.html +++ b/docs/reference/col_content_compare.html @@ -19,7 +19,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/colcompare.html b/docs/reference/colcompare.html index 3c512da..98445ba 100644 --- a/docs/reference/colcompare.html +++ b/docs/reference/colcompare.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/collect_osm_features.html b/docs/reference/collect_osm_features.html index 224b2c1..c8c093b 100644 --- a/docs/reference/collect_osm_features.html +++ b/docs/reference/collect_osm_features.html @@ -23,7 +23,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/download_dep_media.html b/docs/reference/download_dep_media.html index f2f1973..e2b6d15 100644 --- a/docs/reference/download_dep_media.html +++ b/docs/reference/download_dep_media.html @@ -18,7 +18,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/download_gdrive_if_missing.html b/docs/reference/download_gdrive_if_missing.html index ff9b0e6..ddd8988 100644 --- a/docs/reference/download_gdrive_if_missing.html +++ b/docs/reference/download_gdrive_if_missing.html @@ -19,7 +19,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/download_seq_media.html b/docs/reference/download_seq_media.html index ee11192..475bbd3 100644 --- a/docs/reference/download_seq_media.html +++ b/docs/reference/download_seq_media.html @@ -18,7 +18,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/drg_example.html b/docs/reference/drg_example.html index 1212031..9aac614 100644 --- a/docs/reference/drg_example.html +++ b/docs/reference/drg_example.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/index.html b/docs/reference/index.html index fb2d1ee..b78c0df 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/install_sp.html b/docs/reference/install_sp.html index 95f5560..9a559ed 100644 --- a/docs/reference/install_sp.html +++ b/docs/reference/install_sp.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/label_converter.html b/docs/reference/label_converter.html index 96c8ed4..1cd96c3 100644 --- a/docs/reference/label_converter.html +++ b/docs/reference/label_converter.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/label_selecter.html b/docs/reference/label_selecter.html index 23e5981..58233a5 100644 --- a/docs/reference/label_selecter.html +++ b/docs/reference/label_selecter.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2 diff --git a/docs/reference/lib_crs.html b/docs/reference/lib_crs.html index 0f0cfca..fa65c02 100644 --- a/docs/reference/lib_crs.html +++ b/docs/reference/lib_crs.html @@ -17,7 +17,7 @@ fistools - 1.2.1 + 1.2.2