Skip to content

Commit 6bf1a6a

Browse files
authored
Merge branch 'develop' into chore/disable-trivy-release-scan
2 parents 5baeff5 + 114c2ea commit 6bf1a6a

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/actions/docker_build/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ runs:
7373
key: ${{ runner.os }}-regclient
7474

7575
- name: DockerHub login
76-
uses: docker/login-action@v3
76+
uses: docker/login-action@v4
7777
with:
7878
username: ${{ inputs.username }}
7979
password: ${{ inputs.password }}
@@ -95,7 +95,7 @@ runs:
9595
uses: ./.github/actions/last_commit
9696
- name: Docker meta
9797
id: meta
98-
uses: docker/metadata-action@v5
98+
uses: docker/metadata-action@v6
9999
with:
100100
images: ${{ inputs.image }}
101101
flavor: |
@@ -139,7 +139,7 @@ runs:
139139
fi
140140
- name: Set up Docker BuildX
141141
if: steps.image_status.outputs.updated != 'true' || inputs.rebuild == 'true'
142-
uses: docker/setup-buildx-action@v3
142+
uses: docker/setup-buildx-action@v4
143143
with:
144144
platforms: linux/amd64
145145
driver: docker-container

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@v6
3232
- id: changed_files
3333
name: Check for file changes
34-
uses: dorny/paths-filter@v3
34+
uses: dorny/paths-filter@v4
3535
with:
3636
base: ${{ github.ref }}
3737
token: ${{ github.token }}

.github/workflows/label-pullrequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020

2121
- name: Check for file changes
22-
uses: dorny/paths-filter@v3
22+
uses: dorny/paths-filter@v4
2323
id: changes
2424
with:
2525
token: ${{ github.token }}

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@v6
4141
- id: changes
4242
name: Check for backend file changes
43-
uses: dorny/paths-filter@v3
43+
uses: dorny/paths-filter@v4
4444
with:
4545
base: ${{ github.ref }}
4646
token: ${{ github.token }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v6
3434
- name: DockerHub login
35-
uses: docker/login-action@v3
35+
uses: docker/login-action@v4
3636
with:
3737
username: ${{ secrets.DOCKERHUB_USERNAME }}
3838
password: ${{ secrets.DOCKERHUB_TOKEN }}
3939
- name: Docker meta
4040
id: meta
41-
uses: docker/metadata-action@v5
41+
uses: docker/metadata-action@v6
4242
with:
4343
images: "unicef/hope-country-report"
4444
tags: |

.github/workflows/sdlc-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242
fetch-depth: 0
4343

4444
- name: Set up Docker Buildx
45-
uses: docker/setup-buildx-action@v3
45+
uses: docker/setup-buildx-action@v4
4646

4747
- name: Log in to Docker Hub
48-
uses: docker/login-action@v3
48+
uses: docker/login-action@v4
4949
with:
5050
username: ${{ secrets.DOCKERHUB_USERNAME }}
5151
password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v6
4545
- id: changes
4646
name: Check for file changes
47-
uses: dorny/paths-filter@v3
47+
uses: dorny/paths-filter@v4
4848
with:
4949
base: ${{ github.ref }}
5050
token: ${{ github.token }}
@@ -116,7 +116,7 @@ jobs:
116116
echo BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_ENV
117117
- name: Docker meta
118118
id: meta
119-
uses: docker/metadata-action@v5
119+
uses: docker/metadata-action@v6
120120
with:
121121
images: "unicef/hope-country-report"
122122
tags: |
@@ -126,7 +126,7 @@ jobs:
126126
type=semver,pattern={{version}}
127127
type=semver,pattern={{raw}}
128128
- name: DockerHub login
129-
uses: docker/login-action@v3
129+
uses: docker/login-action@v4
130130
with:
131131
username: ${{ secrets.DOCKERHUB_USERNAME }}
132132
password: ${{ secrets.DOCKERHUB_TOKEN }}

0 commit comments

Comments
 (0)