From 78579fb9e2341dedb22b481b4bb32e6093d30220 Mon Sep 17 00:00:00 2001 From: mrustl Date: Thu, 5 Jun 2025 10:05:14 +0200 Subject: [PATCH 1/3] Bump versions of GH action dependencies --- .github/workflows/R-CMD-check.yaml | 4 ++-- .github/workflows/pkgdown.yaml | 4 ++-- .github/workflows/pr-commands.yaml | 4 ++-- .github/workflows/test-coverage.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index d13d683..679e7f8 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -23,7 +23,7 @@ jobs: matrix: config: - {os: macOS-latest, r: 'release'} - - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-24.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: windows-latest, r: 'devel'} - {os: windows-latest, r: 'oldrel'} - {os: windows-latest, r: 'release'} @@ -50,7 +50,7 @@ jobs: - name: Cache R packages if: runner.os != 'Windows' - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ env.R_LIBS_USER }} key: ${{ runner.os }}-r-${{ matrix.config.r }}-3-${{ hashFiles('depends.Rds') }} diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 7dc7100..e088ccf 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -13,7 +13,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 @@ -27,7 +27,7 @@ jobs: shell: Rscript {0} - name: Cache R packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ env.R_LIBS_USER }} key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml index cfda2fb..a4d01b6 100644 --- a/.github/workflows/pr-commands.yaml +++ b/.github/workflows/pr-commands.yaml @@ -10,7 +10,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/pr-fetch@v2 with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -33,7 +33,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/pr-fetch@v2 with: repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index c4cfea8..f805145 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -16,7 +16,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 @@ -30,7 +30,7 @@ jobs: shell: Rscript {0} - name: Cache R packages - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ${{ env.R_LIBS_USER }} key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} From 4ddc97991f35e66b0eff632e538d60e1d1c3f9f2 Mon Sep 17 00:00:00 2001 From: mrustl Date: Thu, 5 Jun 2025 10:16:18 +0200 Subject: [PATCH 2/3] Try latest RODBC version (2024-12-12) https://github.com/cran/RODBC/blob/master/ChangeLog --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0930a88..a075751 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -39,7 +39,7 @@ Suggests: testthat (>= 2.2.1), xml2 Remotes: - github::cran/RODBC@1.3-16, + github::cran/RODBC@1.3-26, github::hsonne/odbc32@r3.0.0, github::kwb-r/kwb.datetime, github::kwb-r/kwb.utils From 49ce40e81168c3b65ca61eaed62989ada588eacc Mon Sep 17 00:00:00 2001 From: mrustl Date: Thu, 5 Jun 2025 10:25:37 +0200 Subject: [PATCH 3/3] Prepare bugfix release for RODBC dependency --- DESCRIPTION | 2 +- NEWS.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index a075751..68de456 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: kwb.db Title: Functions supporting data base access -Version: 0.7.0 +Version: 0.7.1 Authors@R: c(person(given = "Hauke", family = "Sonnenberg", diff --git a/NEWS.md b/NEWS.md index d0968ce..47109ef 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# [kwb.db 0.7.1](https://github.com/KWB-R/kwb.db/releases/tag/v0.7.1) 2025-06-05 + +* Use latest RODBC release (2024-12-12) from [https://github.com/cran/RODBC](https://github.com/cran/RODBC) +to fix installation problems on Windows (Ubuntu & macOS package installation still +fails on GH actions) + # [kwb.db 0.7.0](https://github.com/KWB-R/kwb.db/releases/tag/v0.7.0) 2023-09-25 * Add and export `read_schemata()`, `read_relations()`, `merge_relations()`