Skip to content

Commit

Permalink
Merge pull request #172 from mrc-ide/mrc-5736-cache-outpack
Browse files Browse the repository at this point in the history
Cache builds of outpack_server
  • Loading branch information
plietar authored Sep 3, 2024
2 parents 929df0a + d02abc6 commit 859fbd3
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
25 changes: 12 additions & 13 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, epic-poc]
branches: [main]
pull_request:
branches: [main, master, epic-poc]
branches: [main]

name: R-CMD-check

Expand Down Expand Up @@ -42,17 +42,16 @@ jobs:
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

# This does take a minute or two to install, and we could cache
# it but that's not super easy while still allowing easy
# updating. Once things stabilise we might tag outpack server
# releases and then we can install and cache against that.
#
# This now hangs on macOS, will explore binary builds for the
# server in mrc-4515, disabling on mac now.
- name: setup server
if: runner.os != 'macOS'
run: |
cargo install --git https://github.com/mrc-ide/outpack_server --branch main --locked --features git2/vendored-libgit2
# 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
# of the server immediately.
- name: Install outpack server
uses: baptiste0928/cargo-install@v3
with:
crate: outpack
git: https://github.com/mrc-ide/outpack_server
features: git2/vendored-libgit2

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master, epic-poc]
branches: [main]
pull_request:
branches: [main, master, epic-poc]
branches: [main]

name: test-coverage

Expand All @@ -21,9 +21,16 @@ jobs:
with:
use-public-rspm: true

- name: setup server
run: |
cargo install --git https://github.com/mrc-ide/outpack_server --branch main --locked
# 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
# of the server immediately.
- name: Install outpack server
uses: baptiste0928/cargo-install@v3
with:
crate: outpack
git: https://github.com/mrc-ide/outpack_server
features: git2/vendored-libgit2

- uses: r-lib/actions/setup-r-dependencies@v2
with:
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.31
Version: 1.99.32
Authors@R: c(person("Rich", "FitzJohn", role = c("aut", "cre"),
email = "[email protected]"),
person("Robert", "Ashton", role = "aut"),
Expand Down

0 comments on commit 859fbd3

Please sign in to comment.