Merge branch 'master' into jkantor/headingMessage

openedx · Sep 12, 2024 · d608dac · d608dac
2 parents 2208737 + 567a020
commit d608dac
Show file tree

Hide file tree

Showing 4 changed files with 1,652 additions and 2,247 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,16 +11,20 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node: [18.15, 20]
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
     - name: Setup Nodejs Env
       run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
     - name: Setup Nodejs
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
 # Because of node 18 bug (https://github.com/nodejs/node/issues/47563), Pinning node version 18.15 until the next release of node
       with:
-        node-version: 18.15
+        node-version: ${{ matrix.node }}
 
     - name: Install dependencies
       run: npm ci

diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml
@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfile-check.yml@master
+    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.19
+20