Skip to content

Commit bdb0d99

Browse files
committed
Merge branch 'develop' into DSEGOG-361-view-all-users
2 parents ebe97d0 + e2cbc62 commit bdb0d99

File tree

157 files changed

+8210
-2750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+8210
-2750
lines changed

.github/workflows/ci-build.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Node.js
1818
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
1919
with:
20-
node-version: 20
20+
node-version: 22
2121
cache: 'yarn'
2222
- name: Install dependencies
2323
run: yarn --immutable
@@ -27,7 +27,7 @@ jobs:
2727
run: yarn test
2828
- name: Upload unit test coverage
2929
if: success()
30-
uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4
30+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5
3131
with:
3232
token: ${{ secrets.CODECOV_TOKEN }}
3333
fail_ci_if_error: true
@@ -40,18 +40,15 @@ jobs:
4040
- name: Setup Node.js
4141
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
4242
with:
43-
node-version: 20
43+
node-version: 22
4444
cache: 'yarn'
4545
- name: Install dependencies
46-
# Ubuntu 16+ does not install libgconf-2-4 by default, so we need to install it ourselves (for Cypress)
47-
run: |
48-
sudo apt-get install libgconf-2-4
49-
yarn --immutable
46+
run: yarn --immutable
5047
- name: Run e2e tests
5148
run: yarn e2e
5249
- name: Upload Cypress screenshots
5350
if: failure()
54-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
51+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
5552
with:
5653
name: OperationsGateway Screenshots
5754
path: cypress/screenshots
@@ -62,7 +59,7 @@ jobs:
6259
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
6360
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
6461
with:
65-
node-version: 20
62+
node-version: 22
6663
cache: 'yarn'
6764

6865
- name: Install dependencies
@@ -72,7 +69,7 @@ jobs:
7269
run: yarn playwright:test:mocked
7370

7471
- name: Upload test report
75-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
72+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
7673
if: always()
7774
with:
7875
name: playwright-report-mocked-tests
@@ -103,7 +100,7 @@ jobs:
103100
with:
104101
python-version: 3.9
105102
- name: Load Pip cache
106-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
103+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
107104
with:
108105
path: ~/.cache/pip
109106
key: ubuntu-20.04-pip-3.9-${{ env.pythonLocation }}-${{ hashFiles('operationsgateway-api/.github/ci_requirements.txt') }}
@@ -138,7 +135,7 @@ jobs:
138135

139136
# Load Poetry virtual environment dependencies and install API dependencies
140137
- name: Load Poetry cache
141-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
138+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4
142139
with:
143140
path: ~/.cache/pypoetry/virtualenvs
144141
key: ubuntu-20.04-poetry-3.9-${{ env.pythonLocation }}-${{ hashFiles('poetry.lock') }}
@@ -210,7 +207,7 @@ jobs:
210207

211208
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
212209
with:
213-
node-version: 20
210+
node-version: 22
214211
cache: 'yarn'
215212

216213
- name: Install dependencies
@@ -220,7 +217,7 @@ jobs:
220217
run: yarn playwright:test:real
221218

222219
- name: Upload test report
223-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
220+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
224221
if: always()
225222
with:
226223
name: playwright-report-real-tests

.github/workflows/release-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
- name: Extract metadata (tags, labels) for Docker
2424
id: meta
25-
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
25+
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
2626
with:
2727
images: ${{ secrets.HARBOR_URL }}/operationsgateway
2828

2929
- name: Build and push Docker image to Harbor
30-
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
30+
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
3131
with:
3232
context: .
3333
file: ./Dockerfile

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Dockerfile to build and serve OperationsGateway
22

33
# Build stage
4-
FROM node:20.17.0-alpine3.20@sha256:2d07db07a2df6830718ae2a47db6fedce6745f5bcd174c398f2acdda90a11c03 as builder
4+
FROM node:22.12.0-alpine3.20@sha256:027911463b296bdaf6df82b5ccf2c6b290fee725d5fba6513a037ed019400625 as builder
55

66
WORKDIR /operationsgateway-build
77

@@ -28,7 +28,7 @@ RUN set -eux; \
2828
yarn build;
2929

3030
# Run stage
31-
FROM httpd:2.4.62-alpine3.20@sha256:66c49302c02430619abb84240a438bcfc083015661009fcaaeaac931450f62cd
31+
FROM httpd:2.4.62-alpine3.20@sha256:b64b5734fbc0fbb8fb995d5cc29a2ff2d86ed4c83dfd4f4d82d183f2a66daed4
3232

3333
WORKDIR /usr/local/apache2/htdocs
3434

0 commit comments

Comments
 (0)