Skip to content

Commit 05fa17f

Browse files
authored
Merge branch 'master' into dependabot/nuget/backend/tests/Seed.IntegrationTests/multi-952690bfef
2 parents a0fc08b + 8232f98 commit 05fa17f

8 files changed

Lines changed: 215 additions & 194 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
backend: ${{ steps.filter.outputs.backend }}
1616
frontend: ${{ steps.filter.outputs.frontend }}
1717
steps:
18-
- uses: actions/checkout@v4
19-
- uses: dorny/paths-filter@v3
18+
- uses: actions/checkout@v6
19+
- uses: dorny/paths-filter@v4
2020
id: filter
2121
with:
2222
filters: |
@@ -30,7 +30,7 @@ jobs:
3030
if: needs.changes.outputs.backend == 'true'
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434

3535
- name: Setup .NET 10
3636
uses: actions/setup-dotnet@v4
@@ -114,7 +114,7 @@ jobs:
114114
115115
- name: Upload test results
116116
if: always()
117-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@v7
118118
with:
119119
name: backend-test-results
120120
path: backend/tests/**/TestResults/*.trx
@@ -124,7 +124,7 @@ jobs:
124124
if: needs.changes.outputs.frontend == 'true'
125125
runs-on: ubuntu-latest
126126
steps:
127-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v6
128128

129129
- name: Setup Node.js 22
130130
uses: actions/setup-node@v4

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
# - "production": required reviewers + wait timer
5454

5555
steps:
56-
- uses: actions/checkout@v4
56+
- uses: actions/checkout@v6
5757

5858
- name: Check which images were built
5959
id: check
@@ -238,8 +238,8 @@ jobs:
238238
docker compose -f "$COMPOSE_FILE" up -d --no-deps web
239239
fi
240240
241-
echo "Ensuring infrastructure services are running..."
242-
docker compose -f "$COMPOSE_FILE" up -d nginx
241+
echo "Restarting nginx to pick up new templates and container IPs..."
242+
docker compose -f "$COMPOSE_FILE" up -d --force-recreate nginx
243243
244244
docker image prune -f
245245

.github/workflows/docker-publish.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
backend: ${{ steps.filter.outputs.backend }}
3232
frontend: ${{ steps.filter.outputs.frontend }}
3333
steps:
34-
- uses: actions/checkout@v4
35-
- uses: dorny/paths-filter@v3
34+
- uses: actions/checkout@v6
35+
- uses: dorny/paths-filter@v4
3636
id: filter
3737
with:
3838
filters: |
@@ -46,18 +46,18 @@ jobs:
4646
if: needs.changes.outputs.backend == 'true' || inputs.force_api == true
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v6
5050

5151
- name: Log in to GitHub Container Registry
52-
uses: docker/login-action@v3
52+
uses: docker/login-action@v4
5353
with:
5454
registry: ghcr.io
5555
username: ${{ github.actor }}
5656
password: ${{ secrets.GITHUB_TOKEN }}
5757

5858
- name: Docker metadata
5959
id: meta
60-
uses: docker/metadata-action@v5
60+
uses: docker/metadata-action@v6
6161
with:
6262
images: ghcr.io/${{ github.repository }}/api
6363
tags: |
@@ -72,7 +72,7 @@ jobs:
7272
uses: docker/setup-buildx-action@v3
7373

7474
- name: Build and push API image
75-
uses: docker/build-push-action@v6
75+
uses: docker/build-push-action@v7
7676
with:
7777
context: backend
7878
file: backend/src/Seed.Api/Dockerfile
@@ -94,18 +94,18 @@ jobs:
9494
if: needs.changes.outputs.frontend == 'true' || inputs.force_web == true
9595
runs-on: ubuntu-latest
9696
steps:
97-
- uses: actions/checkout@v4
97+
- uses: actions/checkout@v6
9898

9999
- name: Log in to GitHub Container Registry
100-
uses: docker/login-action@v3
100+
uses: docker/login-action@v4
101101
with:
102102
registry: ghcr.io
103103
username: ${{ github.actor }}
104104
password: ${{ secrets.GITHUB_TOKEN }}
105105

106106
- name: Docker metadata
107107
id: meta
108-
uses: docker/metadata-action@v5
108+
uses: docker/metadata-action@v6
109109
with:
110110
images: ghcr.io/${{ github.repository }}/web
111111
tags: |
@@ -120,7 +120,7 @@ jobs:
120120
uses: docker/setup-buildx-action@v3
121121

122122
- name: Build and push Web image
123-
uses: docker/build-push-action@v6
123+
uses: docker/build-push-action@v7
124124
with:
125125
context: frontend/web
126126
file: frontend/web/Dockerfile

.github/workflows/gitleaks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
gitleaks:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v6
1818
with:
1919
fetch-depth: 0
2020

.github/workflows/hotfix-backmerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717

1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
fetch-depth: 0
2222

.github/workflows/semgrep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
container:
2121
image: semgrep/semgrep
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424

2525
- name: Run Semgrep
2626
run: |

0 commit comments

Comments
 (0)