Skip to content

Commit fdd8573

Browse files
Merge branch 'main' into feat/tls-ui-api-server
2 parents f7703a9 + 9bb8059 commit fdd8573

32 files changed

+651
-1405
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 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

@@ -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@c0fc915677567258ee3c194d03ffe7ae3dc8d741 # 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@c0fc915677567258ee3c194d03ffe7ae3dc8d741 # 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@c0fc915677567258ee3c194d03ffe7ae3dc8d741 # ratchet:github/codeql-action/analyze@v4
4646
with:
4747
category: '/language:${{matrix.language}}'

.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@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2
13+
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2
1414
with:
1515
egress-policy: audit
1616

.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: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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

.github/workflows/npm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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

0 commit comments

Comments
 (0)