Fix Ubuntu installation

.github/workflows/R-CMD-check.yaml

@@ -23,66 +23,62 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest, r: 'release'}
-          - {os: ubuntu-22.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-22.04, r: 'release'}
           - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'oldrel'}
           - {os: windows-latest, r: 'release'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: ${{ matrix.config.rspm }}
 
     steps:
-      - uses: actions/checkout@v2
 
-      - uses: r-lib/actions/setup-r@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Setup R
+        uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-pandoc@v2
+      - name: Setup Pandoc
+        uses: r-lib/actions/setup-pandoc@v2
 
       - name: Query dependencies
+        shell: Rscript {0}
         run: |
           install.packages('remotes')
-          saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
-        shell: Rscript {0}
+          deps <- remotes::dev_package_deps(dependencies = TRUE)
+          saveRDS(deps, "depends.Rds", version = 2)
 
       - name: Cache R packages
         if: runner.os != 'Windows'
         uses: actions/cache@v4
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ runner.os }}-r-${{ matrix.config.r }}-3-${{ hashFiles('depends.Rds') }}
-          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-3-
+          key:          ${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
+          restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-
 
       - name: Install system dependencies on Linux
         if: runner.os == 'Linux'
         run: |
-          sudo apt-get -y install cmake libssl-dev libgdal-dev gdal-bin libgeos-dev libproj-dev libsqlite3-dev libudunits2-dev
+          sudo apt-get install -y libgdal-dev libudunits2-dev
 
-      - name: Install system dependencies
-        if: runner.os == 'Linux (no, skip!)'
-        env:
-          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
-        run: |
-          Rscript -e "remotes::install_github('r-hub/sysreqs')"
-          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
-          sudo -s eval "$sysreqs"
-      - name: Install dependencies
+      - name: Install R package dependencies
+        shell: Rscript {0}
         run: |
           remotes::install_deps(dependencies = TRUE)
           remotes::install_cran("rcmdcheck")
-        shell: Rscript {0}
 
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
         shell: Rscript {0}
-
+        run: rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning", check_dir = "check")
+
       - name: Upload check results
         if: failure()
         uses: actions/upload-artifact@main
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
-          path: check
+          path: check

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: kwb.rabimo
 Title: R Implementation of Water Balance Model Abimo
-Version: 2.1.0.9000
+Version: 2.1.0
 Authors@R: c(
     person("Hauke", "Sonnenberg", , "hauke.sonnenberg@kompetenz-wasser.de", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9134-2871")),

README.md

@@ -14,7 +14,7 @@ R-implementation of a simple water balance model for urban areas,
   within [BMBF](https://www.bmbf.de/EN/Home/home_node.html)-funded 
   research project [AMAREX](https://amarex-projekt.de/en).
 
-For our Tutorial, click [here](https://kwb-r.github.io/kwb.rabimo/dev/articles/tutorial.html) (see also Documentation below).
+For our Tutorial, click [here](https://kwb-r.github.io/kwb.rabimo/articles/tutorial.html) (see also Documentation below).
 
 ## Installation
 
@@ -76,7 +76,7 @@ kwb.rabimo::calculate_delta_w(
 ### R-package kwb.rabimo
 
 - Package Home: https://kwb-r.github.io/kwb.rabimo
-- Tutorial: https://kwb-r.github.io/kwb.rabimo/dev/articles/tutorial.html
+- Tutorial: https://kwb-r.github.io/kwb.rabimo/articles/tutorial.html
 
 ### Original software "Wasserhaushaltsmodell Berlin ABIMO 3.2"