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

chore: upgrade node version #14968

Merged
merged 51 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3cb8d6c
chore: single source of truth for node version
lodmfjord Apr 12, 2024
4b1a737
fix: hash key
lodmfjord Apr 12, 2024
2df4d00
fix: update docker images
lodmfjord Apr 12, 2024
21ac386
chore: nx format:write update dirty files
andes-it Apr 12, 2024
a095f9e
fix: deps
lodmfjord Apr 12, 2024
04e2f16
chore: nx format:write update dirty files
andes-it Apr 12, 2024
26ff4f6
fix: build arg
lodmfjord Apr 12, 2024
0c30df3
fix: remove echo
lodmfjord Apr 12, 2024
f11b018
Update scripts/ci/Dockerfile
lodmfjord Apr 12, 2024
4cc976f
Update .github/workflows/pullrequest.yml
lodmfjord Apr 12, 2024
c5e73ef
Update .github/workflows/push.yml
lodmfjord Apr 12, 2024
1ddff48
Update scripts/ci/Dockerfile
lodmfjord Apr 12, 2024
cef0a92
Update scripts/ci/10_prepare-docker-deps.sh
lodmfjord Apr 12, 2024
7929815
Update scripts/ci/10_prepare-docker-deps.sh
lodmfjord Apr 12, 2024
4ea535c
fix: formatting
lodmfjord Apr 12, 2024
504b58d
fix: formatting
lodmfjord Apr 12, 2024
9c5cc8d
chore: nx format:write update dirty files
andes-it Apr 12, 2024
256d59c
fix: sparse checkout
lodmfjord Apr 12, 2024
0c0ed08
Update .github/workflows/push.yml
lodmfjord Apr 12, 2024
0695087
chore: nx format:write update dirty files
andes-it Apr 12, 2024
4d811fb
fix: nodejs image tag
lodmfjord Apr 12, 2024
83fb6df
fix: image tag
lodmfjord Apr 12, 2024
bdc7236
fix: skip fetch
lodmfjord Apr 12, 2024
f487d00
Update infra/scripts/Dockerfile
lodmfjord Apr 12, 2024
4eedba2
Update infra/scripts/Dockerfile
lodmfjord Apr 12, 2024
82423b4
fix: ble
lodmfjord Apr 12, 2024
9b1aac5
fix: debug
lodmfjord Apr 12, 2024
c204775
fix: oops
lodmfjord Apr 12, 2024
0f78f93
chore: nx format:write update dirty files
andes-it Apr 12, 2024
5a1cbf3
Merge branch 'main' into upgrade-node-version
lodmfjord Apr 13, 2024
32ca64e
fix: build
lodmfjord Apr 13, 2024
e3c42bd
fix: affect all
lodmfjord Apr 13, 2024
6eb6ced
Merge branch 'main' into upgrade-node-version
lodmfjord Apr 13, 2024
3474f4c
Merge branch 'main' into upgrade-node-version
lodmfjord Apr 16, 2024
741dcec
Merge branch 'main' into upgrade-node-version
lodmfjord Apr 18, 2024
e531c4d
fix: test skipping base tag
lodmfjord Apr 18, 2024
916e050
chore: nx format:write update dirty files
andes-it Apr 18, 2024
d7f338d
Merge branch 'main' into upgrade-node-version
lodmfjord May 22, 2024
e759d9e
fix: update script
lodmfjord May 22, 2024
90ce677
fix: build
lodmfjord May 22, 2024
b15ecb9
fix: main
lodmfjord May 22, 2024
098a47d
fix: build
lodmfjord May 22, 2024
c2ce0c4
Merge branch 'main' into upgrade-node-version
lodmfjord May 24, 2024
3a22b57
fix: revert
lodmfjord May 27, 2024
e81f2ae
Merge branch 'main' into upgrade-node-version
lodmfjord May 27, 2024
63eeb9f
fix: remove trash
lodmfjord May 27, 2024
ae6d7fe
fix: remove error
lodmfjord May 27, 2024
9b4ef6b
Merge branch 'main' into upgrade-node-version
lodmfjord May 28, 2024
2108b5e
Merge branch 'main' into upgrade-node-version
kodiakhq[bot] May 28, 2024
0a866cb
fix: ble
lodmfjord May 28, 2024
84266f6
Merge branch 'main' into upgrade-node-version
kodiakhq[bot] May 28, 2024
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
39 changes: 20 additions & 19 deletions .github/actions/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@ import { WorkflowID } from './git-action-status'
let git = new SimpleGit(process.env.REPO_ROOT!, process.env.SHELL!)

const diffWeight = (s: string[]) => s.length
const rev =
process.env.GITHUB_EVENT_NAME === 'pull_request'
? await findBestGoodRefPR(
diffWeight,
git,
runner,
`'${process.env.HEAD_REF!}'`,
`'${process.env.BASE_REF!}'`,
`'${process.env.PR_REF!}'`,
process.env.WORKFLOW_ID! as WorkflowID,
)
: await findBestGoodRefBranch(
diffWeight,
git,
runner,
`'${process.env.HEAD_REF!}'`,
`'${process.env.BASE_REF!}'`,
process.env.WORKFLOW_ID! as WorkflowID,
)
const rev = process.env.TEST_EVERYTHING
? 'rebuild'
: process.env.GITHUB_EVENT_NAME === 'pull_request'
? await findBestGoodRefPR(
diffWeight,
git,
runner,
`'${process.env.HEAD_REF!}'`,
`'${process.env.BASE_REF!}'`,
`'${process.env.PR_REF!}'`,
process.env.WORKFLOW_ID! as WorkflowID,
)
: await findBestGoodRefBranch(
diffWeight,
git,
runner,
`'${process.env.HEAD_REF!}'`,
`'${process.env.BASE_REF!}'`,
process.env.WORKFLOW_ID! as WorkflowID,
)
lodmfjord marked this conversation as resolved.
Show resolved Hide resolved

if (rev === 'rebuild') {
console.log(`Full rebuild needed`)
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@octokit/rest": "19.0.4",
"@types/debug": "4.1.7",
"@types/jest": "^27.4.1",
"@types/node": "20.11.4",
"@types/node": "20.12.12",
"debug": "4.3.4",
"esbuild": "0.15.10",
"esbuild-runner": "2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"target": "es2015",
"module": "esnext",
"typeRoots": ["node_modules/@types"],
"lib": ["es2019", "esnext.array"],
"lib": ["es2019", "esnext.array", "esnext"],
"skipLibCheck": true,
"skipDefaultLibCheck": true,
"allowSyntheticDefaultImports": true,
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/unit-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ runs:
run: npm install -g yarn
shell: bash

- uses: actions/setup-node@v2
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1610,12 +1610,12 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:20.11.4":
version: 20.11.4
resolution: "@types/node@npm:20.11.4"
"@types/node@npm:20.12.12":
version: 20.12.12
resolution: "@types/node@npm:20.12.12"
dependencies:
undici-types: ~5.26.4
checksum: b9cf2c5397ea31f3355656edd204aee777a36db75b79b8b7aba2bed7ea5b29914fa808489da5c632c5eddbb33c3106188bef0bff3b7648bd39aa50dee466a73b
checksum: 5373983874b9af7c216e7ca5d26b32a8d9829c703a69f1e66f2113598b5be8582c0e009ca97369f1ec9a6282b3f92812208d06eb1e9fc3bd9b939b022303d042
languageName: node
linkType: hard

Expand Down Expand Up @@ -1715,7 +1715,7 @@ __metadata:
"@octokit/rest": 19.0.4
"@types/debug": 4.1.7
"@types/jest": ^27.4.1
"@types/node": 20.11.4
"@types/node": 20.12.12
debug: 4.3.4
esbuild: 0.15.10
esbuild-runner: 2.2.1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/config-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ jobs:
- uses: actions/checkout@v3
if: ${{ github.event_name != 'pull_request' }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down Expand Up @@ -109,9 +109,9 @@ jobs:
matrix: ${{ fromJson(needs.prepare.outputs.ENVS) }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Cache for NodeJS dependencies
id: node-modules
Expand Down
36 changes: 17 additions & 19 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18.8.0'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down Expand Up @@ -80,11 +80,9 @@ jobs:
- name: Calculate cache key for node modules
id: calculate_node_modules_hash
run: |
PACKAGE_JSON_HASH=$(cat package.json | jq '{resolutions,dependencies,devDependencies}' | sha1sum -t | cut -f1 -d" ")
echo "PACKAGE_JSON_HASH: $PACKAGE_JSON_HASH"
export NODE_MODULES_HASH=${{ runner.os }}-${{ hashFiles('yarn.lock') }}-$PACKAGE_JSON_HASH
echo "NODE_MODULES_HASH: $NODE_MODULES_HASH"
echo "node-modules-hash=$NODE_MODULES_HASH" >> $GITHUB_OUTPUT
HASH="$(./scripts/ci/get-node-modules-hash.mjs)"
echo "node-modules-hash: ${HASH}"
echo "node-modules-hash=${HASH}" >> $GITHUB_OUTPUT

- name: Calculate cache keys for generated files
id: calculate_generated_files_cache_key
Expand Down Expand Up @@ -246,9 +244,9 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down Expand Up @@ -307,9 +305,9 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down Expand Up @@ -370,9 +368,9 @@ jobs:
path: node_modules
key: ${{ needs.prepare.outputs.node-modules-hash }}-yarn

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'

- name: Setup yarn
run: npm install -g yarn
Expand Down Expand Up @@ -413,9 +411,9 @@ jobs:
- uses: actions/checkout@v3
if: ${{ github.ref == 'ref/heads/main' }}

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'
- name: Setup yarn
run: npm install -g yarn

Expand Down Expand Up @@ -457,9 +455,9 @@ jobs:
matrix: ${{ fromJson(needs.prepare.outputs.LINT_CHUNKS) }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'
- name: Setup yarn
run: npm install -g yarn
- name: Cache for NodeJS dependencies - host OS
Expand Down Expand Up @@ -506,9 +504,9 @@ jobs:
if: needs.prepare.outputs.BUILD_CHUNKS
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '18'
node-version-file: 'package.json'
- name: Setup yarn
run: npm install -g yarn
- name: Cache for NodeJS dependencies - host OS
Expand Down
Loading
Loading