From 43e17f16a1fcc1b3775ed713c81a65957f488cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Li=C3=A9tar?= Date: Tue, 3 Dec 2024 16:08:11 +0000 Subject: [PATCH] Install outpack_server before R. For some inexplicable reason, outpack_server fails to install on Windows if installed after R. --- .github/workflows/R-CMD-check.yaml | 16 ++++++++-------- .github/workflows/test-coverage.yaml | 8 ++++---- DESCRIPTION | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 305e4ff6..e41d50ba 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -34,14 +34,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-pandoc@v2 - - - uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ matrix.config.r }} - http-user-agent: ${{ matrix.config.http-user-agent }} - use-public-rspm: true - # Compiling outpack server from source takes a few minutes each time. # This action will cache the result and re-use it on subsequent builds. # The cache is keyed by Git revision, allowing us to pick up new versions @@ -53,6 +45,14 @@ jobs: git: https://github.com/mrc-ide/outpack_server features: git2/vendored-libgit2 + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: any::rcmdcheck diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 0b7f62aa..b3d3bbd0 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -17,10 +17,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-r@v2 - with: - use-public-rspm: true - # Compiling outpack server from source takes a few minutes each time. # This action will cache the result and re-use it on subsequent builds. # The cache is keyed by Git revision, allowing us to pick up new versions @@ -32,6 +28,10 @@ jobs: git: https://github.com/mrc-ide/outpack_server features: git2/vendored-libgit2 + - uses: r-lib/actions/setup-r@v2 + with: + use-public-rspm: true + - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: any::covr diff --git a/DESCRIPTION b/DESCRIPTION index b8bd1aca..31a70c05 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: orderly2 Title: Orderly Next Generation -Version: 1.99.57 +Version: 1.99.58 Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"), email = "rich.fitzjohn@gmail.com"), person("Robert", "Ashton", role = "aut"),