Skip to content

Commit 2fd5393

Browse files
evegufyevegufy
committed
Merge branch 'main' into merge/v1.1.0-rc.1
2 parents 41847c8 + e845488 commit 2fd5393

26 files changed

+618
-264
lines changed

‎.github/dependabot.yml

-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ updates:
2323
# NuGet
2424
-
2525
package-ecosystem: "nuget"
26-
target-branch: dev
2726
directory: /
2827
labels:
2928
- "dependabot"
@@ -42,7 +41,6 @@ updates:
4241
# Github Actions
4342
-
4443
package-ecosystem: "github-actions"
45-
target-branch: dev
4644
directory: /
4745
labels:
4846
- "dependabot"
@@ -56,7 +54,6 @@ updates:
5654
# Docker
5755
-
5856
package-ecosystem: "docker"
59-
target-branch: dev
6057
directory: ./docker/
6158
labels:
6259
- "dependabot"

‎.github/workflows/chart-test.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
push:
2424
paths:
2525
- 'charts/ssi-credential-issuer/**'
26-
branches: [main, dev, release-candidate]
26+
branches: [main]
2727
pull_request:
2828
paths:
2929
- 'charts/ssi-credential-issuer/**'
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Build migration image
6464
id: build-migration-image
65-
uses: docker/build-push-action@v3
65+
uses: docker/build-push-action@v6
6666
with:
6767
context: .
6868
file: ./docker/Dockerfile-credential-issuer-migrations
@@ -71,7 +71,7 @@ jobs:
7171

7272
- name: Build service image
7373
id: build-service-image
74-
uses: docker/build-push-action@v3
74+
uses: docker/build-push-action@v6
7575
with:
7676
context: .
7777
file: ./docker/Dockerfile-credential-issuer-service
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Build expiry app
8282
id: build-expiry-app-image
83-
uses: docker/build-push-action@v3
83+
uses: docker/build-push-action@v6
8484
with:
8585
context: .
8686
file: ./docker/Dockerfile-credential-expiry-app
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Build processes worker
9191
id: build-processes-worker-image
92-
uses: docker/build-push-action@v3
92+
uses: docker/build-push-action@v6
9393
with:
9494
context: .
9595
file: ./docker/Dockerfile-credential-issuer-processes-worker

‎.github/workflows/codeql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373

7474
# Initializes the CodeQL tools for scanning.
7575
- name: Initialize CodeQL
76-
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v2.227
76+
uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227
7777
with:
7878
languages: ${{ matrix.language }}
7979
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -87,7 +87,7 @@ jobs:
8787
# Automates dependency installation for Python, Ruby, and JavaScript, optimizing the CodeQL analysis setup.
8888
# If this step fails, then you should remove it and run the build manually (see below)
8989
- name: Autobuild
90-
uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v2.227
90+
uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227
9191

9292
# ℹ️ Command-line programs to run using the OS shell.
9393
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -100,6 +100,6 @@ jobs:
100100
# ./location_of_script_within_repo/buildscript.sh
101101

102102
- name: Perform CodeQL Analysis
103-
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v2.227
103+
uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v2.227
104104
with:
105105
category: "/language:${{matrix.language}}"

‎.github/workflows/credential-expiry-app-docker.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
- 'docker/Dockerfile-credential-expiry-app'
3131

3232
branches:
33-
- 'dev'
33+
- 'main'
3434
workflow_dispatch:
3535

3636
env:
@@ -49,25 +49,25 @@ jobs:
4949

5050
- name: Login to DockerHub
5151
if: github.event_name != 'pull_request'
52-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
52+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
5353
with:
5454
username: ${{ secrets.DOCKER_HUB_USER }}
5555
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5656

5757
- name: Set up Docker Buildx
58-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
58+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
5959

6060
- name: Docker meta
6161
id: meta
6262
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
6363
with:
6464
images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
6565
tags: |
66-
type=raw,value=dev
66+
type=raw,value=main
6767
type=raw,value=${{ github.sha }}
6868
6969
- name: Build and push Docker image
70-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
70+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7171
with:
7272
context: .
7373
file: ./docker/Dockerfile-credential-expiry-app

‎.github/workflows/dependencies.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ name: Check Dependencies
2121

2222
on:
2323
push:
24-
branches: [main, dev]
24+
branches: [main]
2525
pull_request:
2626
types: [opened, synchronize, reopened]
2727
workflow_dispatch:
@@ -87,7 +87,7 @@ jobs:
8787
if: steps.dependencies-changed.outputs.changed == 'true'
8888

8989
- name: Upload DEPENDENCIES file
90-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
90+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
9191
with:
9292
path: DEPENDENCIES
9393
if: steps.dependencies-changed.outputs.changed == 'true'

‎.github/workflows/kics.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ name: "KICS"
2121

2222
on:
2323
push:
24-
branches: [main, dev]
24+
branches: [main]
2525
# pull_request:
2626
# The branches below must be a subset of the branches above
2727
# branches: [main, dev]
@@ -45,7 +45,7 @@ jobs:
4545
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4646

4747
- name: KICS scan
48-
uses: checkmarx/kics-github-action@d1b692d84c536f4e8696954ce7aab6818f95f5bc # v2.0.0
48+
uses: checkmarx/kics-github-action@252e73959bd4809a14863cbfbb42d7a90d5a4860 # v2.1.1
4949
with:
5050
# Scanning directory .
5151
path: "."
@@ -69,7 +69,7 @@ jobs:
6969
# Upload findings to GitHub Advanced Security Dashboard
7070
- name: Upload SARIF file for GitHub Advanced Security Dashboard
7171
if: always()
72-
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
72+
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
7373
with:
7474
sarif_file: kicsResults/results.sarif
7575

‎.github/workflows/lint-pull-request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: Validate PR title
3232
runs-on: ubuntu-latest
3333
steps:
34-
- uses: amannn/action-semantic-pull-request@cfb60706e18bc85e8aec535e3c577abe8f70378e # v5.5.2
34+
- uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
3535
id: lint_pr_title
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/migrations-docker.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
name: Build Migrations Image
2121

22-
on:
22+
on:
2323
push:
2424
paths:
2525
# service and transitive paths
@@ -31,7 +31,7 @@ on:
3131
- 'docker/Dockerfile-credential-issuer-migrations'
3232

3333
branches:
34-
- 'dev'
34+
- 'main'
3535
workflow_dispatch:
3636

3737
env:
@@ -50,25 +50,25 @@ jobs:
5050

5151
- name: Login to DockerHub
5252
if: github.event_name != 'pull_request'
53-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
53+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
5454
with:
5555
username: ${{ secrets.DOCKER_HUB_USER }}
5656
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5757

5858
- name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
59+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
6060

6161
- name: Docker meta
6262
id: meta
6363
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
6464
with:
6565
images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
6666
tags: |
67-
type=raw,value=dev
67+
type=raw,value=main
6868
type=raw,value=${{ github.sha }}
6969
7070
- name: Build and push Docker image
71-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
71+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7272
with:
7373
context: .
7474
file: ./docker/Dockerfile-credential-issuer-migrations

‎.github/workflows/owasp-zap.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262

6363
- name: Build migration image
6464
id: build-migration-image
65-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
65+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
6666
with:
6767
context: .
6868
file: ./docker/Dockerfile-credential-issuer-migrations
@@ -71,7 +71,7 @@ jobs:
7171

7272
- name: Build service image
7373
id: build-service-image
74-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
74+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7575
with:
7676
context: .
7777
file: ./docker/Dockerfile-credential-issuer-service
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Build Worker image
8282
id: build-worker-image
83-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
83+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
8484
with:
8585
context: .
8686
file: ./docker/Dockerfile-credential-issuer-processes-worker
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Build Expiry image
9191
id: build-expiry-image
92-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
92+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
9393
with:
9494
context: .
9595
file: ./docker/Dockerfile-credential-expiry-app
@@ -144,7 +144,7 @@ jobs:
144144
145145
- name: Upload HTML report
146146
if: success() || failure()
147-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
147+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
148148
with:
149149
name: ZAP scan report
150150
path: ./report_html.html

‎.github/workflows/processes-worker-docker.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ on:
3030
- 'docker/Dockerfile-credential-issuer-processes-worker'
3131

3232
branches:
33-
- 'dev'
33+
- 'main'
3434
workflow_dispatch:
3535

3636
env:
@@ -49,25 +49,25 @@ jobs:
4949

5050
- name: Login to DockerHub
5151
if: github.event_name != 'pull_request'
52-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
52+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
5353
with:
5454
username: ${{ secrets.DOCKER_HUB_USER }}
5555
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5656

5757
- name: Set up Docker Buildx
58-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
58+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
5959

6060
- name: Docker meta
6161
id: meta
6262
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
6363
with:
6464
images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
6565
tags: |
66-
type=raw,value=dev
66+
type=raw,value=main
6767
type=raw,value=${{ github.sha }}
6868
6969
- name: Build and push Docker image
70-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
70+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7171
with:
7272
context: .
7373
file: ./docker/Dockerfile-credential-issuer-processes-worker

‎.github/workflows/release.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ on:
2525
paths:
2626
- 'charts/**'
2727
branches:
28-
- main
28+
- 'main'
29+
- 'release/v*.*.*'
30+
2931

3032
jobs:
3133
release-helm-chart:
@@ -111,13 +113,13 @@ jobs:
111113
fetch-depth: 0
112114

113115
- name: Login to DockerHub
114-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
116+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
115117
with:
116118
username: ${{ secrets.DOCKER_HUB_USER }}
117119
password: ${{ secrets.DOCKER_HUB_TOKEN }}
118120

119121
- name: Set up Docker Buildx
120-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
122+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
121123

122124
# Create SemVer or ref tags dependent of trigger event
123125
- name: Docker meta
@@ -136,7 +138,7 @@ jobs:
136138
type=semver,pattern={{major}}.{{minor}},value=${{ needs.release-helm-chart.outputs.app-version }}
137139
138140
- name: Build and push Docker images
139-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
141+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
140142
with:
141143
context: .
142144
file: ${{ matrix.dockerfile }}

‎.github/workflows/release_candidate.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ jobs:
5353

5454
- name: Login to DockerHub
5555
if: github.event_name != 'pull_request'
56-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
56+
uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
5757
with:
5858
username: ${{ secrets.DOCKER_HUB_USER }}
5959
password: ${{ secrets.DOCKER_HUB_TOKEN }}
6060

6161
- name: Set up Docker Buildx
62-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
62+
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
6363

6464
- name: Docker meta
6565
id: meta
@@ -71,7 +71,7 @@ jobs:
7171
type=raw,value=${{ github.sha }}
7272
7373
- name: Build and push Docker images
74-
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5.3.0
74+
uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
7575
with:
7676
context: .
7777
file: ${{ matrix.dockerfile }}

0 commit comments

Comments
 (0)