Skip to content

Commit

Permalink
Merge pull request #171 from CityOfPhiladelphia/node-cache-2
Browse files Browse the repository at this point in the history
adds nearby datasets and moves npm caching process to main
  • Loading branch information
ajrothwell authored Dec 6, 2023
2 parents 995dad1 + 1ef0ab2 commit 3f7d66c
Show file tree
Hide file tree
Showing 9 changed files with 649 additions and 868 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev2_push_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: dev Push to S3
on:
push:
branches:
- main
- ux-review-nearby-rebase

jobs:
build:
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/dev_push_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,30 @@ name: dev Push to S3
on:
push:
branches:
- add-vue-gtag
- node-cache-2

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v1
- uses: actions/checkout@v3
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '16.x'
cache: 'npm'

- name: install npm 6
run: |
npm install -g npm@6
- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
npm install
git config --global url."https://".insteadOf ssh://
npm ci
npm run build
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/prod_push_to_s3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,22 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Use Node.js 14.x
uses: actions/setup-node@v1
- uses: actions/checkout@v3
- name: Use Node.js 16.x
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '16.x'
cache: 'npm'

- name: install npm 6
run: |
npm install -g npm@6
- name: npm install, and build
run: |
printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc
npm install
git config --global url."https://".insteadOf ssh://
npm ci
npm run build
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }}
Expand Down
Loading

0 comments on commit 3f7d66c

Please sign in to comment.