Merge branch 'master' into bacup-tests-pr

alxndrsn · Dec 10, 2024 · bad8ed4 · bad8ed4
2 parents 79b8390 + 7bb0360
commit bad8ed4
Show file tree

Hide file tree

Showing 66 changed files with 2,535 additions and 688 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: cimg/node:20.17.0
+      - image: cimg/node:22.12.0
       - image: cimg/postgres:14.10
         environment:
           POSTGRES_PASSWORD: odktest

diff --git a/.github/workflows/oidc-e2e.yml b/.github/workflows/oidc-e2e.yml
@@ -1,6 +1,8 @@
 name: OIDC e2e tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 env:
   DEBUG: pw:api
@@ -27,10 +29,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: make test-oidc-e2e
     - name: Archive playwright screenshots

diff --git a/.github/workflows/oidc-integration.yml b/.github/workflows/oidc-integration.yml
@@ -1,6 +1,8 @@
 name: OIDC integration tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   oidc-integration-test:
@@ -23,10 +25,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
     - run: FAKE_OIDC_ROOT_URL=http://localhost:9898 make fake-oidc-server-ci > fake-oidc-server.log &

diff --git a/.github/workflows/s3-e2e.yml b/.github/workflows/s3-e2e.yml
@@ -1,6 +1,8 @@
 name: S3 E2E Tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   s3-e2e:
@@ -41,10 +43,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
     - run: node lib/bin/create-docker-databases.js

diff --git a/.github/workflows/soak-test.yml b/.github/workflows/soak-test.yml
@@ -1,6 +1,8 @@
 name: Soak Test
 
-on: push
+on:
+  push:
+    branches: master
 
 jobs:
   soak-test:
@@ -23,10 +25,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
     - run: node lib/bin/create-docker-databases.js

diff --git a/.github/workflows/standard-e2e.yml b/.github/workflows/standard-e2e.yml
@@ -1,6 +1,8 @@
 name: Standard E2E Tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 env:
   LOG_LEVEL: DEBUG
@@ -26,10 +28,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.10.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
     - run: node lib/bin/create-docker-databases.js

diff --git a/.github/workflows/standard-suite.yml b/.github/workflows/standard-suite.yml
@@ -1,6 +1,8 @@
 name: Full Standard Test Suite
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   standard-tests:
@@ -23,10 +25,10 @@ jobs:
           --health-retries 5
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js 20
+    - name: Set node version
       uses: actions/setup-node@v4
       with:
-        node-version: 20.17.0
+        node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
     - run: node lib/bin/create-docker-databases.js

diff --git a/Makefile b/Makefile
@@ -101,27 +101,27 @@ debug: base
 
 .PHONY: test
 test: lint
-	BCRYPT=insecure npx mocha --recursive
+	BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive
 
 .PHONY: test-ci
 test-ci: lint
-	BCRYPT=insecure npx mocha --recursive --reporter test/ci-mocha-reporter.js
+	BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive --reporter test/ci-mocha-reporter.js
 
 .PHONY: test-fast
 test-fast: node_version
-	BCRYPT=insecure npx mocha --recursive --fgrep @slow --invert
+	BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive --fgrep @slow --invert
 
 .PHONY: test-integration
 test-integration: node_version
-	BCRYPT=insecure npx mocha --recursive test/integration
+	BCRYPT=insecure npx --node-options="--no-deprecation" mocha --recursive test/integration
 
 .PHONY: test-unit
 test-unit: node_version
 	BCRYPT=insecure npx mocha --recursive test/unit
 
 .PHONY: test-coverage
 test-coverage: node_version
-	npx nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test
+	npx --node-options="--no-deprecation" nyc -x "**/migrations/**" --reporter=lcov node_modules/.bin/_mocha --recursive test
 
 .PHONY: lint
 lint: node_version