Skip to content

Commit 5897a25

Browse files
authored
Prepare Alpha2 (#283)
1 parent 378e9d4 commit 5897a25

4 files changed

Lines changed: 22 additions & 21 deletions

File tree

.github/workflows/build-docker.yml

Lines changed: 8 additions & 8 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 }}
@@ -74,7 +74,7 @@ jobs:
7474
cache-to: type=registry,mode=max,ref=${{ env.GHCR_REPO }}:cache-${{ matrix.tag }}-${{ env.SAFE_REF }}
7575

7676
- name: Scan image with Trivy
77-
uses: aquasecurity/trivy-action@0.34.1
77+
uses: aquasecurity/trivy-action@0.35.0
7878
with:
7979
image-ref: "${{ env.GHCR_REPO }}:${{ github.sha }}-${{ matrix.tag }}"
8080
format: "table"
@@ -95,19 +95,19 @@ jobs:
9595

9696
steps:
9797
- name: Install Cosign
98-
uses: sigstore/cosign-installer@v3.9.2
98+
uses: sigstore/cosign-installer@v4.1.0
9999

100100
- name: Docker meta
101101
id: meta
102-
uses: docker/metadata-action@v5
102+
uses: docker/metadata-action@v6
103103
with:
104104
images: |
105105
${{ env.GHCR_REPO }}
106106
flavor: ${{ inputs.flavor }}
107107
tags: ${{ inputs.tags }}
108108

109109
- name: Login to GitHub container registry
110-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
111111
with:
112112
registry: ghcr.io
113113
username: ${{ github.actor }}

.github/workflows/ci.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020

2121
env:
2222
CARGO_TERM_COLOR: always
23+
# sccache
24+
SCCACHE_GHA_ENABLED: "true"
25+
RUSTC_WRAPPER: "sccache"
2326

2427
jobs:
2528
test:
@@ -29,12 +32,12 @@ jobs:
2932

3033
steps:
3134
- name: Checkout
32-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3336
with:
3437
submodules: recursive
3538

3639
- name: Scan code with Trivy
37-
uses: aquasecurity/trivy-action@0.34.1
40+
uses: aquasecurity/trivy-action@0.35.0
3841
with:
3942
scan-type: 'fs'
4043
scan-ref: '.'
@@ -43,10 +46,8 @@ jobs:
4346
severity: "CRITICAL,HIGH,MEDIUM"
4447
scanners: "vuln"
4548

46-
- name: Cache
47-
uses: Swatinem/rust-cache@v2
48-
with:
49-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
49+
- name: Run sccache-cache
50+
uses: mozilla-actions/sccache-action@v0.0.9
5051

5152
- name: Install dependencies
5253
run: apt-get update && apt-get -y install protobuf-compiler libnftnl-dev libmnl-dev

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ 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

@@ -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: |

.github/workflows/sbom.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
2828
2929
- name: Checkout
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
ref: ${{ steps.vars.outputs.TAG_NAME }}
3333
submodules: recursive
3434

3535
- name: Create SBOM with Trivy
36-
uses: aquasecurity/trivy-action@0.34.1
36+
uses: aquasecurity/trivy-action@0.35.0
3737
with:
3838
scan-type: 'fs'
3939
format: 'spdx-json'
@@ -43,7 +43,7 @@ jobs:
4343
scanners: "vuln"
4444

4545
- name: Create docker image SBOM with Trivy
46-
uses: aquasecurity/trivy-action@0.34.1
46+
uses: aquasecurity/trivy-action@0.35.0
4747
with:
4848
image-ref: "ghcr.io/defguard/gateway:${{ steps.vars.outputs.VERSION }}"
4949
scan-type: 'image'
@@ -53,7 +53,7 @@ jobs:
5353
scanners: "vuln"
5454

5555
- name: Create security advisory file with Trivy
56-
uses: aquasecurity/trivy-action@0.34.1
56+
uses: aquasecurity/trivy-action@0.35.0
5757
with:
5858
scan-type: 'fs'
5959
format: 'json'
@@ -63,7 +63,7 @@ jobs:
6363
scanners: "vuln"
6464

6565
- name: Create docker image security advisory file with Trivy
66-
uses: aquasecurity/trivy-action@0.34.1
66+
uses: aquasecurity/trivy-action@0.35.0
6767
with:
6868
image-ref: "ghcr.io/defguard/gateway:${{ steps.vars.outputs.VERSION }}"
6969
scan-type: 'image'

0 commit comments

Comments
 (0)