Skip to content

Commit 9068f75

Browse files
authored
Update workflows (#300)
1 parent 24ebbec commit 9068f75

3 files changed

Lines changed: 18 additions & 21 deletions

File tree

.github/workflows/build-docker.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,25 @@ jobs:
4343

4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747
with:
4848
submodules: recursive
4949

5050
- name: Login to GitHub container registry
51-
uses: docker/login-action@v3
51+
uses: docker/login-action@v4
5252
with:
5353
registry: ghcr.io
5454
username: ${{ github.actor }}
5555
password: ${{ secrets.GITHUB_TOKEN }}
5656

5757
- name: Set up Docker Buildx
58-
uses: docker/setup-buildx-action@v3
58+
uses: docker/setup-buildx-action@v4
5959

6060
- name: Sanitize branch name
6161
run: echo "SAFE_REF=${GITHUB_REF_NAME//\//-}" >> $GITHUB_ENV
6262

6363
- name: Build container
64-
uses: docker/build-push-action@v5
64+
uses: docker/build-push-action@v7
6565
with:
6666
context: .
6767
platforms: linux/${{ matrix.cpu }}
@@ -75,9 +75,6 @@ jobs:
7575

7676
- name: Scan image with Trivy
7777
uses: aquasecurity/trivy-action@0.35.0
78-
env:
79-
TRIVY_SHOW_SUPPRESSED: 1
80-
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
8178
with:
8279
image-ref: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
8380
format: "table"
@@ -98,19 +95,19 @@ jobs:
9895

9996
steps:
10097
- name: Install Cosign
101-
uses: sigstore/cosign-installer@v3.9.2
98+
uses: sigstore/cosign-installer@v4.1.0
10299

103100
- name: Docker meta
104101
id: meta
105-
uses: docker/metadata-action@v5
102+
uses: docker/metadata-action@v6
106103
with:
107104
images: |
108105
${{ env.GHCR_REPO }}
109106
flavor: ${{ inputs.flavor }}
110107
tags: ${{ inputs.tags }}
111108

112109
- name: Login to GitHub container registry
113-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
114111
with:
115112
registry: ghcr.io
116113
username: ${{ github.actor }}

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@ jobs:
3838

3939
- name: Scan code with Trivy
4040
uses: aquasecurity/trivy-action@0.35.0
41-
env:
42-
TRIVY_SHOW_SUPPRESSED: 1
43-
TRIVY_IGNOREFILE: "./.trivyignore.yaml"
4441
with:
45-
scan-type: "fs"
46-
scan-ref: "."
42+
scan-type: 'fs'
43+
scan-ref: '.'
4744
exit-code: "1"
4845
ignore-unfixed: true
4946
severity: "CRITICAL,HIGH,MEDIUM"
@@ -65,10 +62,13 @@ jobs:
6562
rustup component add clippy
6663
cargo clippy --all-targets --all-features -- -D warnings
6764
65+
- name: Install cargo extensions
66+
uses: taiki-e/install-action@v2
67+
with:
68+
tool: cargo-deny
69+
6870
- name: Run cargo deny
69-
run: |
70-
cargo install cargo-deny
71-
cargo deny check
71+
run: cargo deny check
7272

7373
- name: Run tests
7474
run: cargo test --locked --no-fail-fast

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ jobs:
9292
echo Version: $VERSION
9393
echo "VERSION=$VERSION" >> $GITHUB_ENV
9494
- name: Checkout
95-
uses: actions/checkout@v3
95+
uses: actions/checkout@v6
9696
with:
9797
submodules: recursive
9898

9999
- name: Install Rust stable
100100
uses: actions-rs/toolchain@v1
101101
with:
102-
toolchain: stable
102+
toolchain: 1.89.0 # "stable" causes rust-lld: error on aarch64-linux
103103
target: ${{ matrix.target }}
104104
override: true
105105

@@ -118,7 +118,7 @@ jobs:
118118
run: mv target/${{ matrix.target }}/release/defguard-gateway ${{ matrix.asset_name }}-${{ github.ref_name }}
119119

120120
- name: Tar
121-
uses: a7ul/tar-action@v1.1.0
121+
uses: a7ul/tar-action@v1.2.0
122122
with:
123123
command: c
124124
files: |

0 commit comments

Comments
 (0)