Skip to content

Commit

Permalink
Node 18 -> 20 (#2022)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfontanarosa authored Sep 19, 2024
1 parent 6b0d87c commit 68294a2
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 31 deletions.
14 changes: 7 additions & 7 deletions .github/actions/create-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ name: Create a new survey

inputs:
platform-repository:
description: 'ground-platform repository under test'
description: "ground-platform repository under test"
default: google/ground-platform

upload-artifacts:
description: 'Whether to upload the final emulator data artifacts'
default: 'false'
description: "Whether to upload the final emulator data artifacts"
default: "false"

runs:
using: 'composite'
using: "composite"
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -41,7 +41,7 @@ runs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Load cached Node modules
id: cache-npm
Expand All @@ -68,7 +68,7 @@ runs:
id: setup-chrome
with:
chrome-version: 125

- name: Save CHROME_PATH
shell: bash
run: echo "CHROME_PATH=${{ steps.setup-chrome.outputs.chrome-path }}" >> $GITHUB_ENV
Expand Down Expand Up @@ -98,7 +98,7 @@ runs:
uses: actions/upload-artifact@v4
with:
name: data-create
path: '**/test'
path: "**/test"
retention-days: 7
overwrite: true
if-no-files-found: error
15 changes: 7 additions & 8 deletions .github/actions/verify-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ name: Verify survey submissions

inputs:
platform-repository:
description: 'ground-platform repository under test'
description: "ground-platform repository under test"
default: google/ground-platform

use-repo-data:
description: 'Whether to use the local repository emulator data or not'
default: 'true'
description: "Whether to use the local repository emulator data or not"
default: "true"

runs:
using: 'composite'
using: "composite"
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -41,7 +41,7 @@ runs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Load cached Node modules
id: cache-npm
Expand All @@ -62,13 +62,13 @@ runs:
continue-on-error: true
shell: bash
run: npm list

- name: Install Chrome
uses: browser-actions/setup-chrome@v1
id: setup-chrome
with:
chrome-version: 125

- name: Save CHROME_PATH
shell: bash
run: |
Expand All @@ -78,7 +78,6 @@ runs:
shell: bash
run: npm install @nx/nx-linux-x64-gnu


- name: Install dependencies
shell: bash
run: npm run ci-all
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Install dependencies
run: npm run ci-all
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-lib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
pull_request:
paths:
- "lib/**"
jobs:
jobs:
check:
name: Check
runs-on: ubuntu-latest
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Install dependencies
run: npm run ci-all
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-proto.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18"
node-version: "20"

- name: Create empty key files
run: ./precheck.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-to-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: "18.x"
node-version: "20"

- name: Create firebase-config.ts
uses: "finnp/create-file-action@master"
Expand All @@ -38,13 +38,13 @@ jobs:

- name: Install deps
run: npm run ci-all

- name: Build Ground
run: npm run build-all --config=dev --project=gnd-dev

- name: Deploy to Firebase
uses: docker://w9jds/firebase-action:master
with:
args: deploy --project gnd-dev
args: deploy --project gnd-dev
env:
GCP_SA_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_GND_DEV }}
GCP_SA_KEY: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_GND_DEV }}
2 changes: 1 addition & 1 deletion e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"typescript": "~4.7.0"
},
"engines": {
"node": "18"
"node": "20"
}
}
2 changes: 1 addition & 1 deletion functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"ts-node": "^10.9.1"
},
"engines": {
"node": "18"
"node": "20"
},
"private": true,
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"build-all-and-test": "npm run build-all && npm run test"
},
"engines": {
"node": "18"
"node": "20"
},
"private": true,
"dependencies": {
Expand Down
2 changes: 2 additions & 0 deletions lib/src/proto-to-firestore.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ describe('toDocumentData()', () => {
expected: {
[s.name]: 'Survey name',
[s.description]: 'Survey desc',
[s.state]: Survey.State.STATE_UNSPECIFIED
},
},
{
Expand Down Expand Up @@ -83,6 +84,7 @@ describe('toDocumentData()', () => {
email1: 2, // DATA_COLLECTOR
email2: 3, // SURVEY_ORGANIZER
},
[s.state]: Survey.State.STATE_UNSPECIFIED
},
},
{
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"tslib": "^2.6.2"
},
"engines": {
"node": "18"
"node": "20"
},
"workspaces": [
"proto",
Expand Down

0 comments on commit 68294a2

Please sign in to comment.