Skip to content

Commit

Permalink
SF-3128 Upgrade to Node v22 (#2946)
Browse files Browse the repository at this point in the history
  • Loading branch information
pmachapman authored Jan 18, 2025
1 parent 62ec49b commit 20b77b8
Show file tree
Hide file tree
Showing 16 changed files with 1,901 additions and 2,315 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
matrix:
# Environments in which to run, such as those used in development and production, or which are candidates to
# move to.
os: ["ubuntu-20.04"]
os: ["ubuntu-22.04"]
dotnet_version: ["8.0.x"]
node_version: ["18.20.2"]
npm_version: ["10.9.0"]
node_version: ["22.13.0"]
npm_version: ["10.9.2"]
# Continue building in other environments to see which are working.
fail-fast: false
runs-on: ${{matrix.os}}
Expand Down Expand Up @@ -102,10 +102,10 @@ jobs:
name: "Production build and test"
strategy:
matrix:
os: ["ubuntu-20.04"]
os: ["ubuntu-22.04"]
dotnet_version: ["8.0.x"]
node_version: ["18.20.2"]
npm_version: ["10.9.0"]
node_version: ["22.13.0"]
npm_version: ["10.9.2"]
fail-fast: false
runs-on: ${{matrix.os}}
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
name: "Deploy Storybook to Chromatic"
strategy:
matrix:
os: ["ubuntu-20.04"]
node_version: ["18.20.2"]
npm_version: ["10.9.0"]
os: ["ubuntu-22.04"]
node_version: ["22.13.0"]
npm_version: ["10.9.2"]
runs-on: ${{matrix.os}}
steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-lint-prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:

strategy:
matrix:
node_version: ["18.20.2"]
npm_version: ["10.9.0"]
node_version: ["22.13.0"]
npm_version: ["10.9.2"]

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-production-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
strategy:
matrix:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
node_version: ["18.20.2"]
npm_version: ["10.9.0"]
node_version: ["22.13.0"]
npm_version: ["10.9.2"]
os: [ubuntu-latest]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ jobs:
release_branch: "sf-live"

dotnet_version: "8.0.x"
node_version: "18.20.2"
npm_version: "10.9.0"
os: "ubuntu-20.04"
node_version: "22.13.0"
npm_version: "10.9.2"
os: "ubuntu-22.04"

angular_config: "production"
app_name: "scriptureforge"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ jobs:
release_branch: "sf-qa"

dotnet_version: "8.0.x"
node_version: "18.20.2"
npm_version: "10.9.0"
os: "ubuntu-20.04"
node_version: "22.13.0"
npm_version: "10.9.2"
os: "ubuntu-22.04"

angular_config: "staging"
app_name: "scriptureforge"
Expand Down
4 changes: 4 additions & 0 deletions deploy/callback_plugins/output_human_2.x.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
FIELDS = ['cmd', 'command', 'start', 'end', 'delta', 'msg', 'stdout',
'stderr', 'results']

# Support Python 3.x
import sys
if sys.version_info[0] >= 3:
unicode = str

class CallbackModule(CallbackBase):
def human_log(self, data):
Expand Down
2 changes: 1 addition & 1 deletion deploy/dev-server.playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
vars_files:
- "vars/os_defaults.yml"
vars:
node_version: "18.20.2"
node_version: "22.13.0"
mongodb_version: "8.0"
repo_path: "{{ playbook_dir }}/.."
pre_tasks:
Expand Down
2 changes: 1 addition & 1 deletion deploy/vagrant/sfdev/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Vagrant.configure("2") do |config|
git fetch
cd ~/code/web-xforge/
sudo npm install --global [email protected]
sudo npm install --global [email protected].2
# Remove canary
rm ~/Desktop/warning-not-provisioned.txt
Expand Down
2 changes: 1 addition & 1 deletion src/RealtimeServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG ARCHITECTURE=amd64
ARG DOTNET_VERSION=8.0
ARG UBUNTU_NAME=jammy # 22.04
ARG NODE_VERSION=18.20.2 # From dependencies.yml
ARG NODE_VERSION=22.13.0

# Build Jering node web server to RealtimeServer
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-${UBUNTU_NAME}-${ARCHITECTURE} AS jering-build
Expand Down
Loading

0 comments on commit 20b77b8

Please sign in to comment.