Skip to content

Commit f95f5b8

Browse files
authored
Merge branch 'main' into fix/gitleaks-log-opts-windows
2 parents 00081fa + fe1df00 commit f95f5b8

171 files changed

Lines changed: 7236 additions & 6431 deletions

File tree

Some content is hidden

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

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Resolves #
5353
Tests are required for new functionality (80%+ patch coverage enforced by CodeCov).
5454
Add tests in the appropriate location:
5555
- test/ — Unit and integration tests (Vitest). Organised by module (processors/, db/, services/, plugin/, etc.)
56-
- tests/e2e/ — End-to-end tests (Vitest + Docker). Real git operations against a containerised environment.
56+
- test/e2e/ — End-to-end tests (Vitest + Docker). Real git operations against a containerised environment.
5757
- cypress/e2e/ — UI tests (Cypress). Dashboard UI end-to-end tests.
5858
-->
5959

‎.github/dependabot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ updates:
2222
- package-ecosystem: docker
2323
directories:
2424
- '/'
25-
- '/localgit'
2625
schedule:
2726
interval: weekly
2827
cooldown:

.grype.yaml renamed to .github/security/grype.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fail-on-severity: high
22
sort-by: severity
3-
output-template-file: .grype-report.tmpl
3+
output-template-file: .github/security/grype-report.tmpl
44

55
ignore:
66
- fix-state: 'wont-fix'

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: CI
55

66
on:
77
push:
8-
branches: [main]
8+
branches: [main, 'release/**']
99
pull_request:
10-
branches: [main]
10+
branches: [main, 'release/**']
1111

1212
permissions:
1313
pull-requests: write
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Harden Runner
27-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
27+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
2828
with:
2929
egress-policy: audit
3030

@@ -43,7 +43,9 @@ jobs:
4343
mongodb-version: ${{ matrix.mongodb-version }}
4444

4545
- name: Install dependencies
46-
run: npm ci --no-fund
46+
run: |
47+
npm i -g npm@11
48+
npm ci --no-fund
4749
4850
# for now only check the types of the server
4951
# tsconfig isn't quite set up right to respect what vite accepts
@@ -72,7 +74,7 @@ jobs:
7274
run: npm run test:integration
7375

7476
- name: Upload test coverage report
75-
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
77+
uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
7678
with:
7779
files: ./coverage/lcov.info,./coverage-cli/lcov.info
7880
token: ${{ secrets.CODECOV_TOKEN }}
@@ -81,7 +83,7 @@ jobs:
8183
run: npm run build-ui
8284

8385
- name: Run cypress test
84-
uses: cypress-io/github-action@c32f12761482a282d24ca0fd7466d8ae86f54ba8 # v7.4.2
86+
uses: cypress-io/github-action@01e3b659a495b41649cdd0aa82e1d1624e26520b # v7.4.4
8587
with:
8688
# skip the action's internal npm ci — dependencies are already installed above
8789
install: false
@@ -96,7 +98,7 @@ jobs:
9698

9799
steps:
98100
- name: Harden Runner
99-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
101+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
100102
with:
101103
egress-policy: audit
102104

@@ -135,6 +137,7 @@ jobs:
135137
npm run test-coverage-ci
136138
npm run test-coverage-ci --workspaces --if-present
137139
140+
# Smoke test deliberately removed due to long running times
138141
- name: Build frontend
139142
run: npm run build-ui
140143

@@ -146,7 +149,7 @@ jobs:
146149
needs: [build-ubuntu, build-windows]
147150
steps:
148151
- name: Harden the runner (Audit all outbound calls)
149-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
152+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
150153
with:
151154
egress-policy: audit
152155

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: 'CodeQL'
22

33
on:
44
push:
5-
branches: ['main']
5+
branches: ['main', 'release/**']
66
pull_request:
7-
branches: ['main']
7+
branches: ['main', 'release/**']
88
schedule:
99
- cron: '25 10 * * 1'
1010

@@ -26,22 +26,22 @@ jobs:
2626

2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
29+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
3030
with:
3131
egress-policy: audit
3232

3333
- name: Checkout repository
3434
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3535

3636
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@d97b3428e8eebbb1810cf454d6397886d136b4ba # ratchet:github/codeql-action/init@v4
37+
uses: github/codeql-action/init@fa8392b7e54a5d74a53270a4aa7defa307aa415c # ratchet:github/codeql-action/init@v4
3838
with:
3939
languages: ${{ matrix.language }}
4040

4141
- name: Autobuild
42-
uses: github/codeql-action/autobuild@d97b3428e8eebbb1810cf454d6397886d136b4ba # ratchet:github/codeql-action/autobuild@v4
42+
uses: github/codeql-action/autobuild@fa8392b7e54a5d74a53270a4aa7defa307aa415c # ratchet:github/codeql-action/autobuild@v4
4343

4444
- name: Perform CodeQL Analysis
45-
uses: github/codeql-action/analyze@d97b3428e8eebbb1810cf454d6397886d136b4ba # ratchet:github/codeql-action/analyze@v4
45+
uses: github/codeql-action/analyze@fa8392b7e54a5d74a53270a4aa7defa307aa415c # ratchet:github/codeql-action/analyze@v4
4646
with:
4747
category: '/language:${{matrix.language}}'

‎.github/workflows/cve.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ permissions:
55

66
on:
77
push:
8-
branches: ['main']
8+
branches: ['main', 'release/**']
99
pull_request:
10-
branches: ['main']
10+
branches: ['main', 'release/**']
1111
schedule:
1212
- cron: '0 6 * * 1' # Weekly Monday 6am UTC
1313

@@ -20,34 +20,34 @@ jobs:
2020
security-events: write
2121
steps:
2222
- name: Harden Runner
23-
uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4
23+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
2424
with:
2525
egress-policy: audit
2626

2727
- name: Checkout
28-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6
2929

3030
- name: Install Grype
3131
id: grype
32-
uses: anchore/scan-action/download-grype@e1165082ffb1fe366ebaf02d8526e7c4989ea9d2 # v7
32+
uses: anchore/scan-action/download-grype@27805bf3b4e84b4a5c980df22ed233c00390a439 # v7.4.2
3333
with:
3434
cache-db: true
3535

3636
- name: Scan (table)
3737
run: |
3838
${{ steps.grype.outputs.cmd }} dir:. \
39-
--config .grype.yaml \
39+
--config .github/security/grype.yaml \
4040
--output template
4141
4242
- name: Scan (SARIF)
4343
if: ${{ always() }}
4444
run: |
4545
${{ steps.grype.outputs.cmd }} dir:. \
46-
--config .grype.yaml \
46+
--config .github/security/grype.yaml \
4747
--output sarif --file grype-results.sarif || true
4848
4949
- name: Upload SARIF report
5050
if: ${{ always() }}
51-
uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
51+
uses: github/codeql-action/upload-sarif@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4
5252
with:
5353
sarif_file: grype-results.sarif

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Harden Runner
13-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
13+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
1414
with:
1515
egress-policy: audit
1616

‎.github/workflows/docker-publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818

1919
steps:
2020
- name: Harden the runner (Audit all outbound calls)
21-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
21+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
2222
with:
2323
egress-policy: audit
2424

2525
- name: Set up Docker Buildx
26-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
26+
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4
2727

2828
- name: Checkout Repository
2929
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: Build and Publish Docker Image
4848
if: github.repository_owner == 'finos'
49-
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
49+
uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7
5050
with:
5151
context: .
5252
file: Dockerfile

‎.github/workflows/e2e.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77

88
on:
99
push:
10-
branches: [main]
10+
branches: [main, 'release/**']
1111
pull_request:
1212
workflow_dispatch:
1313

@@ -19,26 +19,27 @@ jobs:
1919
suite: [vitest, cypress]
2020
env:
2121
BUILDX_CACHE_SCOPE: ${{ matrix.suite }}-build
22+
COMPOSE_FILE: test/e2e/docker-compose.yml:test/e2e/docker-compose.ci.yml
2223

2324
steps:
2425
- name: Harden the runner (Audit all outbound calls)
25-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
26+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
2627
with:
2728
egress-policy: audit
2829

2930
- name: Checkout code
3031
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3132

3233
- name: Set up Docker Buildx
33-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c
34+
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069
3435
with:
3536
install: true
3637

3738
- name: Expose GitHub Runtime for Docker Cache
3839
uses: crazy-max/ghaction-github-runtime@04d248b84655b509d8c44dc1d6f990c879747487 # v4.0.0
3940

4041
- name: Set up Docker Compose
41-
uses: docker/setup-compose-action@3408803818f5b5065308cdf3293ecbddf1ab2fac
42+
uses: docker/setup-compose-action@54042514f505b273907334ae2b9cdbb9a0213c1a
4243

4344
- name: Set up Node.js
4445
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v6
@@ -56,7 +57,7 @@ jobs:
5657
git config --global init.defaultBranch main
5758
5859
- name: Build and start services with Docker Compose
59-
run: docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait
60+
run: docker compose up -d --build --wait
6061

6162
- name: Debug service state
6263
if: failure()
@@ -101,7 +102,7 @@ jobs:
101102
needs: [e2e]
102103
steps:
103104
- name: Harden the runner (Audit all outbound calls)
104-
uses: step-security/harden-runner@05e31511f85b41b11d1cf0ef85d0992719546e2c # v2.21.0
105+
uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
105106
with:
106107
egress-policy: audit
107108

0 commit comments

Comments
 (0)