Skip to content

Commit

Permalink
Fix CI and build issues (#20)
Browse files Browse the repository at this point in the history
* Add prettymapr explicit dependency

* Update action versions

* Update DB save paths for windows

* Add test ls to view files in working dir

* Remove test ls
  • Loading branch information
dfsnow committed Oct 27, 2023
1 parent 3d0349a commit 5c8435f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/actions/prepare-ptaxsim/action.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Prepare PTAXSIM database
description: Downloads and extracts the PTAXSIM database file from S3
inputs:
PTAXSIM_DB_BASE_URL:
PTAXSIM_DB_BASE_URI:
required: false
type: string
description: S3 URI of PTAXSIM database versions
default: "s3://ccao-data-public-us-east-1/ptaxsim"
ASSUMED_ROLE:
description: "AWS role used for S3"
description: AWS role used for S3 actions
outputs:
PTAXSIM_VERSION:
description: "PTAXSIM database version"
Expand All @@ -16,7 +16,7 @@ runs:
using: composite
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get database version
id: version_db
Expand All @@ -27,7 +27,7 @@ runs:
shell: bash

- name: Cache database
uses: actions/[email protected].1
uses: actions/[email protected].2
id: cache_db
with:
path: ptaxsim.db.bz2
Expand All @@ -36,7 +36,7 @@ runs:

- name: Configure AWS credentials
if: steps.cache_db.outputs.cache-hit != 'true'
uses: aws-actions/configure-aws-credentials@v2
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ inputs.ASSUMED_ROLE }}
aws-region: us-east-1
Expand All @@ -45,7 +45,7 @@ runs:
id: fetch_db
if: steps.cache_db.outputs.cache-hit != 'true'
run: |
aws s3 cp ${{ inputs.PTAXSIM_DB_BASE_URL }}/ptaxsim-${{ env.PTAXSIM_VERSION }}.db.bz2 ${{ github.workspace }}/ptaxsim.db.bz2 --quiet
aws s3 cp ${{ inputs.PTAXSIM_DB_BASE_URI }}/ptaxsim-${{ env.PTAXSIM_VERSION }}.db.bz2 ptaxsim.db.bz2 --quiet
shell: bash

- name: Unpack database (Linux)
Expand All @@ -65,5 +65,5 @@ runs:
- name: Unpack database (Windows)
if: runner.os == 'Windows'
run: |
7z x ${{ github.workspace }}/ptaxsim.db.bz2
7z x ${{ github.workspace }}\ptaxsim.db.bz2
shell: cmd
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup pandoc
uses: r-lib/actions/setup-pandoc@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup pandoc
uses: r-lib/actions/setup-pandoc@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup python
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Suggests:
odbc,
openxlsx,
pkgdown,
prettymapr,
purrr,
readr,
RColorBrewer,
Expand Down

0 comments on commit 5c8435f

Please sign in to comment.