Skip to content

Commit

Permalink
Install outpack_server before R.
Browse files Browse the repository at this point in the history
For some inexplicable reason, outpack_server fails to install on Windows
if installed after R.
  • Loading branch information
plietar committed Dec 4, 2024
1 parent 4a2b98e commit 43e17f1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]"),
person("Robert", "Ashton", role = "aut"),
Expand Down

0 comments on commit 43e17f1

Please sign in to comment.