Skip to content

Commit

Permalink
Merge pull request #1140 from gperdomor/feature/bump-packages
Browse files Browse the repository at this point in the history
chore: bump node to 22 and other packages
  • Loading branch information
gperdomor authored Oct 2, 2024
2 parents 5f164b3 + e1c729d commit 71b977c
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 495 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ permissions:

env:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_TOKEN }}
HUSKY: 0

jobs:
main:
Expand Down
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ workflow:
on_new_commit: conservative

default:
image: node:20
image: node:22

variables:
CI: 'true'
GIT_DEPTH: 0
NX_CLOUD_ACCESS_TOKEN: $NX_CLOUD_TOKEN
HUSKY: 0

.node-cache: &node-cache
key:
Expand All @@ -32,10 +33,9 @@ CI:
# This enables task distribution via Nx Cloud
# Run this command as early as possible, before dependencies are installed
# Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
# Connect your workspace by running "nx connect" and uncomment this
# - npx nx-cloud start-ci-run --distribute-on="3 linux-medium-js" --stop-agents-after="build"

- npm ci --cache .npm --prefer-offline
- npm ci --legacy-peer-deps --cache .npm --prefer-offline

# Prepend any command with "nx-cloud record --" to record its logs to Nx Cloud
# - npx nx-cloud record -- echo Hello World
Expand Down
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
npx --no -- validate-branch-name -r "^(master|main|develop|next){1}$|^(feature|fix|hotfix|release|renovate)/.+$"
npx --no -- lint-staged
npm run check-lock-files
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"!{projectRoot}/src/test-setup.[jt]s",
"!{projectRoot}/test-setup.[jt]s"
],
"sharedGlobals": ["{workspaceRoot}/.gitlab-ci.yml"]
"sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml", "{workspaceRoot}/.gitlab-ci.yml"]
},
"nxCloudAccessToken": "YTA4ZDcwNjQtMDZmNC00YjUyLTk5ZTMtN2E1ZDE1ZTkwMWYxfHJlYWQ=",
"targetDefaults": {
Expand Down
Loading

0 comments on commit 71b977c

Please sign in to comment.