Skip to content

Commit 7b97844

Browse files
authored
Merge branch 'main' into pr-01-script-modularization
2 parents f6e06e0 + 0e26c4b commit 7b97844

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/amd-image-sbom.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
uses: sigstore/cosign-installer@main
3131

3232
- name: Login to Quay
33-
uses: docker/login-action@v3
33+
uses: docker/login-action@v4
3434
with:
3535
registry: quay.io/triton-dev-containers
3636
username: ${{ secrets.qt_username }}
3737
password: ${{ secrets.qt_password }}
3838

3939
- name: Generate SBOM with Trivy
40-
uses: aquasecurity/trivy-action@0.33.1
40+
uses: aquasecurity/trivy-action@0.35.0
4141
with:
4242
image-ref: quay.io/triton-dev-containers/amd:${{ inputs.image-tag }}
4343
format: spdx-json
@@ -51,7 +51,7 @@ jobs:
5151
run: gzip ./sbom-amd-${{ inputs.image-tag }}.spdx.json
5252

5353
- name: Save SBOM as artifact
54-
uses: actions/upload-artifact@v6
54+
uses: actions/upload-artifact@v7
5555
with:
5656
name: sbom-amd-${{ inputs.image-tag }}.spdx.json.gz
5757
path: ./sbom-amd-${{ inputs.image-tag }}.spdx.json.gz

.github/workflows/image-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,27 @@ jobs:
3434
fetch-depth: 0
3535

3636
- name: Set up QEMU
37-
uses: docker/setup-qemu-action@v3
37+
uses: docker/setup-qemu-action@v4
3838
with:
3939
image: tonistiigi/binfmt:qemu-v8.1.5
4040

4141
- name: Set up Docker Buildx
42-
uses: docker/setup-buildx-action@v3
42+
uses: docker/setup-buildx-action@v4
4343

4444
- name: Set up cosign
4545
uses: sigstore/cosign-installer@main
4646

4747
- name: Login to Quay
4848
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
49-
uses: docker/login-action@v3
49+
uses: docker/login-action@v4
5050
with:
5151
registry: quay.io/triton-dev-containers
5252
username: ${{ secrets.qt_username }}
5353
password: ${{ secrets.qt_password }}
5454

5555
- name: Build and (conditionally) push image
5656
id: build-push-image
57-
uses: docker/build-push-action@v6
57+
uses: docker/build-push-action@v7
5858
with:
5959
context: .
6060
platforms: ${{ inputs.platforms }}
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Generate image attestation
7474
if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
75-
uses: actions/attest-build-provenance@v3
75+
uses: actions/attest-build-provenance@v4
7676
with:
7777
subject-name: quay.io/triton-dev-containers/${{ inputs.image-name }}
7878
subject-digest: ${{ steps.build-push-image.outputs.digest }}

.github/workflows/image-sbom.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
uses: sigstore/cosign-installer@main
3535

3636
- name: Login to Quay
37-
uses: docker/login-action@v3
37+
uses: docker/login-action@v4
3838
with:
3939
registry: quay.io/triton-dev-containers
4040
username: ${{ secrets.qt_username }}
4141
password: ${{ secrets.qt_password }}
4242

4343
- name: Generate SBOM with Trivy
44-
uses: aquasecurity/trivy-action@0.33.1
44+
uses: aquasecurity/trivy-action@0.35.0
4545
with:
4646
image-ref: quay.io/triton-dev-containers/${{ inputs.image-name }}:${{ inputs.image-tag }}
4747
format: spdx-json
@@ -58,7 +58,7 @@ jobs:
5858
run: gzip ./sbom-${{ inputs.image-name }}-${{ inputs.image-tag }}.spdx.json
5959

6060
- name: Upload SBOM Artifact
61-
uses: actions/upload-artifact@v6
61+
uses: actions/upload-artifact@v7
6262
with:
6363
name: sbom-${{ inputs.image-name }}-${{ inputs.image-tag }}.spdx.json.gz
6464
path: ./sbom-${{ inputs.image-name }}-${{ inputs.image-tag }}.spdx.json.gz

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ repos:
88
- id: end-of-file-fixer
99
- id: check-added-large-files
1010
- repo: https://github.com/adrienverge/yamllint
11-
rev: v1.37.1
11+
rev: v1.38.0
1212
hooks:
1313
- id: yamllint
1414
- repo: https://github.com/DavidAnson/markdownlint-cli2
15-
rev: v0.18.1
15+
rev: v0.21.0
1616
hooks:
1717
- id: markdownlint-cli2-rules-docker
1818
- repo: https://github.com/codespell-project/codespell
@@ -27,7 +27,7 @@ repos:
2727
hooks:
2828
- id: shellcheck
2929
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
30-
rev: v9.23.0
30+
rev: v9.24.0
3131
hooks:
3232
- id: commitlint
3333
stages: [commit-msg]

0 commit comments

Comments
 (0)