Skip to content

Commit

Permalink
Merge pull request #100 from dfe-analytical-services/development
Browse files Browse the repository at this point in the history
Workflow scripting updates
  • Loading branch information
rmbielby authored Nov 15, 2024
2 parents 8f09392 + b072e25 commit b103c60
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 24 deletions.
15 changes: 2 additions & 13 deletions .github/workflows/deploy-shiny.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,17 @@ name: deploy-shiny

jobs:
deployShiny:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
# Running on mac as it's quicker to build
- {os: macOS-latest, r: 'release'}
runs-on: macOS-latest

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
RENV_PATHS_ROOT: ~/.local/share/renv
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2
with:
r-version: 4.4.1
use-public-rspm: true

- name: Set env vars (dev)
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/shiny-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Cache renv packages
uses: actions/cache@v1
with:
path: ${{ env.RENV_PATHS_ROOT }}
key: ${{ runner.os }}-renv-${{ hashFiles('**/renv.lock') }}
restore-keys: |
${{ runner.os }}-renv-
- name: Restore renv snapshot
shell: Rscript {0}
run: |
Expand Down
6 changes: 3 additions & 3 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -982,9 +982,9 @@
},
"igraph": {
"Package": "igraph",
"Version": "2.1.1",
"Version": "2.0.3",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"Matrix",
"R",
Expand All @@ -1001,7 +1001,7 @@
"utils",
"vctrs"
],
"Hash": "c03878b48737a0e2da3b772d7b2e22da"
"Hash": "c3b7d801d722e26e4cd888e042bf9af5"
},
"isoband": {
"Package": "isoband",
Expand Down
Binary file added tests/testthat/_snaps/testUI/036_.new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/testthat/_snaps/testUI/038_.new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added tests/testthat/_snaps/testUI/039_.new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b103c60

Please sign in to comment.