Skip to content

Commit 4244814

Browse files
sruganosrugano
authored
Merge branch 'develop' into feature/routestream
2 parents e580f93 + d7cf0e9 commit 4244814

8 files changed

Lines changed: 38 additions & 37 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/sdlc-version-create.yml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fetch-depth: 0
3434

3535
- name: Log in to Docker Hub
36-
uses: docker/login-action@v3
36+
uses: docker/login-action@v4
3737
with:
3838
username: ${{ secrets.DOCKERHUB_USERNAME }}
3939
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -80,26 +80,27 @@ jobs:
8080
--push \
8181
./
8282
83-
trivy:
84-
name: Check Release with Trivy
85-
runs-on: ubuntu-latest
86-
needs: [prepare-version, build-push]
87-
permissions:
88-
contents: read # for actions/checkout to fetch code
89-
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
90-
steps:
91-
- name: Checkout code
92-
uses: actions/checkout@v6
93-
94-
- name: Run Trivy vulnerability scanner
95-
uses: aquasecurity/trivy-action@0.34.1
96-
with:
97-
image-ref: ${{ vars.DOCKERHUB_ORGANIZATION }}/${{ vars.DOCKERHUB_REPOSITORY }}:${{ needs.prepare-version.outputs.version }}
98-
format: 'sarif'
99-
output: 'trivy-results.sarif'
100-
severity: 'CRITICAL,HIGH'
101-
102-
- name: Upload Trivy scan results to GitHub Security tab
103-
uses: github/codeql-action/upload-sarif@v4
104-
with:
105-
sarif_file: 'trivy-results.sarif'
83+
# Trivy release scan disabled — uncomment the job below to re-enable
84+
# trivy:
85+
# name: Check Release with Trivy
86+
# runs-on: ubuntu-latest
87+
# needs: [prepare-version, build-push]
88+
# permissions:
89+
# contents: read # for actions/checkout to fetch code
90+
# security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
91+
# steps:
92+
# - name: Checkout code
93+
# uses: actions/checkout@v6
94+
#
95+
# - name: Run Trivy vulnerability scanner
96+
# uses: aquasecurity/trivy-action@0.35.0
97+
# with:
98+
# image-ref: ${{ vars.DOCKERHUB_ORGANIZATION }}/${{ vars.DOCKERHUB_REPOSITORY }}:${{ needs.prepare-version.outputs.version }}
99+
# format: 'sarif'
100+
# output: 'trivy-results.sarif'
101+
# severity: 'CRITICAL,HIGH'
102+
#
103+
# - name: Upload Trivy scan results to GitHub Security tab
104+
# uses: github/codeql-action/upload-sarif@v4
105+
# with:
106+
# sarif_file: 'trivy-results.sarif'

‎.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)