Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adds nearby datasets and moves npm caching process to main #171

Merged
merged 34 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
88b3b5b
merge fixes
ajrothwell Nov 20, 2023
55f0508
more merge fixes
ajrothwell Nov 20, 2023
cc9bf41
the first small changes for the Nearby topic
ajrothwell Sep 7, 2023
1a3ddae
merge changes in nearby.js
ajrothwell Nov 20, 2023
edb9333
more merge changes to nearby.js
ajrothwell Nov 20, 2023
848e5f4
fixes filtering of zoning appeals by time
ajrothwell Sep 26, 2023
2be80c3
adds 3 new nearby datasets
ajrothwell Sep 26, 2023
5c98cb3
merge changes in nearby.js and nearby-violations.js
ajrothwell Nov 20, 2023
13b25b6
more merge changes to nearby.js
ajrothwell Nov 20, 2023
e224cff
pushes to dev2 from rebased branch
ajrothwell Nov 20, 2023
0f5d0bd
uses mapboard commit that fixes small bug
ajrothwell Nov 20, 2023
bc1bebf
uses pvc and mapboard commits that remember table filter options
ajrothwell Nov 21, 2023
c978ed5
uses pvc that fixes bug with filter value
ajrothwell Nov 21, 2023
2302024
uses mapboard commit that allows table groups to remember selected so…
ajrothwell Nov 24, 2023
f9e78bd
uses mapboard commit that fixes bug with remembering value of sort dr…
ajrothwell Nov 24, 2023
94b254b
tests github action after removing node-sass
ajrothwell Nov 28, 2023
23a4d38
tries using node 18.x for github action
ajrothwell Nov 28, 2023
ab0d03e
trying node 20
ajrothwell Nov 28, 2023
d4f5f8c
trying node 16
ajrothwell Nov 28, 2023
0228ab8
tring node 15
ajrothwell Nov 28, 2023
d35f815
uses node 18, not 18.x
ajrothwell Nov 28, 2023
19f42fb
tries checkout and setup-node v4
ajrothwell Nov 28, 2023
3b14b32
tries push with node 16.x and caching
ajrothwell Nov 29, 2023
26ed3d3
uses actions/checkout@v3
ajrothwell Nov 29, 2023
828c96b
uses npm install again, instead of npm ci
ajrothwell Nov 29, 2023
54fbdbf
rolls other parts of .github actions back
ajrothwell Nov 29, 2023
089635c
tries using mapboard release
ajrothwell Nov 29, 2023
baab7b4
uses npm ci again
ajrothwell Nov 29, 2023
bb56de4
changes to package.lock
ajrothwell Nov 29, 2023
15fa0a8
tries adding git command to action
ajrothwell Nov 29, 2023
3f25612
uses mapboard commit instead of npm release
ajrothwell Nov 29, 2023
f0e77fa
adds back cache: 'npm'
ajrothwell Nov 29, 2023
ab82d3b
testing cache
ajrothwell Nov 29, 2023
1ef0ab2
sets up npm caching in prod push
ajrothwell Nov 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading