Skip to content

Commit cd90d1b

Browse files
committed
chore: merge upstream main
2 parents 48614fb + 1bda10c commit cd90d1b

Some content is hidden

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

67 files changed

+2908
-1796
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Harden Runner
28-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
28+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
2929
with:
3030
egress-policy: audit
3131

@@ -77,20 +77,20 @@ jobs:
7777
run: npm run build-ui
7878

7979
- name: Save build folder
80-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
80+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
8181
with:
8282
name: build-ubuntu-node-${{ matrix.node-version }}-mongo-${{ matrix.mongodb-version }}
8383
if-no-files-found: error
8484
path: build
8585

8686
- name: Download the build folders
87-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
87+
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8
8888
with:
8989
name: build-ubuntu-node-${{ matrix.node-version }}-mongo-${{ matrix.mongodb-version }}
9090
path: build
9191

9292
- name: Run cypress test
93-
uses: cypress-io/github-action@f790eee7a50d9505912f50c2095510be7de06aa7 # v6.10.9
93+
uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
9494
with:
9595
start: npm start &
9696
wait-on: 'http://localhost:3000'
@@ -103,7 +103,7 @@ jobs:
103103

104104
steps:
105105
- name: Harden Runner
106-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
106+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
107107
with:
108108
egress-policy: audit
109109

.github/workflows/codeql.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ jobs:
2626

2727
steps:
2828
- name: Harden Runner
29-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2
29+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2
3030
with:
3131
egress-policy: audit
3232

3333
- name: Checkout repository
34-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # ratchet:actions/checkout@v6
34+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3535

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

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

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

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Harden Runner
13-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2
13+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2
1414
with:
1515
egress-policy: audit
1616

1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1919
- name: Dependency Review
2020
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4
2121
with:

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
1717

1818
- name: Checkout Repository
19-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2020

2121
- name: Log in to Docker Hub
2222
if: github.repository == 'finos/git-proxy'
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: Build and Publish Docker Image
3838
if: github.repository == 'finos/git-proxy'
39-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
39+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
4040
with:
4141
context: .
4242
file: Dockerfile

.github/workflows/e2e.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
20+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2121

2222
- name: Set up Docker Buildx
2323
uses: docker/setup-buildx-action@7c525be6cc8a882d5163ce04293cac18617c709f
2424

2525
- name: Set up Docker Compose
26-
uses: docker/setup-compose-action@e79596b1b4769557c41cc0bb1e796ebe62acd639
26+
uses: docker/setup-compose-action@112d3e30db3bf437d207fea57f22510569d1ab97
2727

2828
- name: Set up Node.js
29-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
29+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
3030
with:
3131
node-version: '20'
3232
cache: 'npm'
@@ -41,15 +41,13 @@ jobs:
4141
git config --global init.defaultBranch main
4242
4343
- name: Build and start services with Docker Compose
44-
run: docker compose up -d --build
44+
run: docker compose up -d --build --wait || true
4545

46-
- name: Wait for services to be ready
46+
- name: Debug service state
47+
if: always()
4748
run: |
48-
timeout 60 bash -c '
49-
while [ "$(docker compose ps | grep -c "Up")" -ne 3 ]; do
50-
sleep 2
51-
done
52-
' || { echo "Service readiness check failed:"; docker compose ps; exit 1; }
49+
docker compose ps
50+
docker compose logs
5351
5452
- name: Run E2E tests
5553
run: npm run test:e2e

.github/workflows/experimental-inventory-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ jobs:
2424

2525
steps:
2626
- name: Harden Runner
27-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
27+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
2828
with:
2929
egress-policy: audit
3030

31-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232
with:
3333
fetch-depth: 0
3434

3535
- name: Use Node.js ${{ matrix.node-version }}
36-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
36+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
3737
with:
3838
node-version: ${{ matrix.node-version }}
3939

.github/workflows/experimental-inventory-cli-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
17+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
1818
with:
1919
egress-policy: audit
2020

21-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2222

2323
# Setup .npmrc file to publish to npm
24-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
24+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
2525
with:
2626
node-version: '22.x'
2727
registry-url: 'https://registry.npmjs.org'

.github/workflows/experimental-inventory-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
17+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
1818
with:
1919
egress-policy: audit
2020

21-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2222

2323
# Setup .npmrc file to publish to npm
24-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
24+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
2525
with:
2626
node-version: '22.x'
2727
registry-url: 'https://registry.npmjs.org'

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps: # list of steps
1616
- name: Harden Runner
17-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2
17+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2
1818
with:
1919
egress-policy: audit
2020

2121
- name: Install NodeJS
22-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
22+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
2323
with:
2424
node-version: ${{ env.NODE_VERSION }}
2525

2626
- name: Code Checkout
27-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
27+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2828
with:
2929
fetch-depth: 0
3030

.github/workflows/npm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Harden Runner
14-
uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
14+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15.0
1515
with:
1616
egress-policy: audit
1717

18-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
18+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1919
# Setup .npmrc file to publish to npm
20-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
20+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
2121
with:
2222
node-version: '24'
2323
registry-url: 'https://registry.npmjs.org'

0 commit comments

Comments
 (0)