From f6df172d156c3f544c701dfd0718f2d34a37f367 Mon Sep 17 00:00:00 2001 From: Eoin Whelan Date: Thu, 26 Mar 2026 14:08:02 +0000 Subject: [PATCH 1/3] Rename and fix install Action --- .github/workflows/{install_test.yml => install.yml} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) rename .github/workflows/{install_test.yml => install.yml} (88%) diff --git a/.github/workflows/install_test.yml b/.github/workflows/install.yml similarity index 88% rename from .github/workflows/install_test.yml rename to .github/workflows/install.yml index dde718f..f59a447 100644 --- a/.github/workflows/install_test.yml +++ b/.github/workflows/install.yml @@ -11,7 +11,7 @@ on: jobs: test-install: # This workflow should only run in Hirlam/obsmon to not overuse GitHub action minutes in forks - if: github.repository == 'Hirlam/Harmonie' + if: github.repository == 'Hirlam/obsmon' runs-on: ubuntu-latest @@ -66,14 +66,13 @@ jobs: ls -latr /home/runner/.cache/Rlibs/${{ matrix.r-version }}/R-libs du -sh /home/runner/.cache/Rlibs/${{ matrix.r-version }}/R-libs - # 7. Install a test package (should go into cache) - - name: Install test R package - run: | - Rscript -e 'install.packages("jsonlite", repos="https://cloud.r-project.org")' - # 8. Install obsmon R packages - name: Install obsmon R packages - run: ./install -output-rootdir /home/runner/.cache/Rlibs/${{ matrix.r-version }} + run: | + ls -ltr /home/runner/.cache/Rlibs/${{ matrix.r-version }} + ls -ltr /home/runner/.cache/Rlibs/${{ matrix.r-version }}/R-libs + ./install -output-rootdir /home/runner/.cache/Rlibs/${{ matrix.r-version }} + ls -ltr /home/runner/.cache/Rlibs/${{ matrix.r-version }}/R-libs # 9. Verify cache contents - name: Verify cached packages From b98fe3d55f6ad00273dfd335a2dcb23c8ba12dde Mon Sep 17 00:00:00 2001 From: Eoin Whelan Date: Thu, 26 Mar 2026 14:09:40 +0000 Subject: [PATCH 2/3] Update Change Log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a82fa1..117703e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org). ## [Unreleased] ### Fixed +- Correct install Action [!56](https://github.com/Hirlam/obsmon/pull/56) - Correct Actions [!52](https://github.com/Hirlam/obsmon/pull/52) - Correct ECMWF documentation [!51](https://github.com/Hirlam/obsmon/pull/51) ### Added From ac6e7800b86ec27e28e53c44aa39f2afa762e2b8 Mon Sep 17 00:00:00 2001 From: Eoin Whelan Date: Thu, 26 Mar 2026 14:17:58 +0000 Subject: [PATCH 3/3] Cache more needed files --- .github/workflows/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index f59a447..f2e2b1b 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -41,7 +41,7 @@ jobs: - name: Cache R packages uses: actions/cache@v4 with: - path: /home/runner/.cache/Rlibs/${{ matrix.r-version }}/R-libs + path: /home/runner/.cache/Rlibs/${{ matrix.r-version }} key: ${{ runner.os }}-r-${{ matrix.r-version }}-${{ hashFiles('**/DESCRIPTION') }} restore-keys: | ${{ runner.os }}-r-${{ matrix.r-version }}-