From 5c8435f6c9c5db05c637ac3347d216c3d61655a6 Mon Sep 17 00:00:00 2001
From: Dan Snow <31494343+dfsnow@users.noreply.github.com>
Date: Fri, 27 Oct 2023 15:50:53 -0500
Subject: [PATCH] Fix CI and build issues (#20)

* 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
---
 .github/actions/prepare-ptaxsim/action.yaml | 16 ++++++++--------
 .github/workflows/R-CMD-check.yaml          |  2 +-
 .github/workflows/lint.yaml                 |  2 +-
 .github/workflows/pkgdown.yaml              |  2 +-
 .github/workflows/pre-commit.yaml           |  2 +-
 .github/workflows/test-coverage.yaml        |  2 +-
 DESCRIPTION                                 |  1 +
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/actions/prepare-ptaxsim/action.yaml b/.github/actions/prepare-ptaxsim/action.yaml
index e85024f..bd5fcf7 100644
--- a/.github/actions/prepare-ptaxsim/action.yaml
+++ b/.github/actions/prepare-ptaxsim/action.yaml
@@ -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"
@@ -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
@@ -27,7 +27,7 @@ runs:
       shell: bash
 
     - name: Cache database
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@v3.3.2
       id: cache_db
       with:
         path: ptaxsim.db.bz2
@@ -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
@@ -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)
@@ -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
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index e6e6f44..532692b 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -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
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 507fedb..2c8b81e 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -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
diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
index da46d29..133749c 100644
--- a/.github/workflows/pkgdown.yaml
+++ b/.github/workflows/pkgdown.yaml
@@ -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
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
index 51ff54d..9fbe18d 100644
--- a/.github/workflows/pre-commit.yaml
+++ b/.github/workflows/pre-commit.yaml
@@ -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
diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
index c4d4298..cf19ee0 100644
--- a/.github/workflows/test-coverage.yaml
+++ b/.github/workflows/test-coverage.yaml
@@ -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
diff --git a/DESCRIPTION b/DESCRIPTION
index ae7c668..8a9cae4 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -39,6 +39,7 @@ Suggests:
     odbc,
     openxlsx,
     pkgdown,
+    prettymapr,
     purrr,
     readr,
     RColorBrewer,