Skip to content

Commit 002a4db

Browse files
Merge pull request #118 from DefGuard/release/1.4
Release/1.4
2 parents e9a70a7 + 85b0ae9 commit 002a4db

22 files changed

+2568
-3606
lines changed

.github/workflows/build-docker.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ jobs:
2323
- ${{ matrix.runner }}
2424
strategy:
2525
matrix:
26-
cpu: [arm64, amd64, arm/v7]
26+
cpu: [arm64, amd64]
2727
include:
2828
- cpu: arm64
2929
runner: ARM64
3030
tag: arm64
3131
- cpu: amd64
3232
runner: X64
3333
tag: amd64
34-
- cpu: arm/v7
35-
runner: ARM
36-
tag: armv7
3734
steps:
3835
- name: Checkout
3936
uses: actions/checkout@v4
@@ -86,6 +83,6 @@ jobs:
8683
for tag in ${tags}
8784
do
8885
docker manifest rm ${tag} || true
89-
docker manifest create ${tag} ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64 ${{ env.GHCR_REPO }}:${{ github.sha }}-armv7
86+
docker manifest create ${tag} ${{ env.GHCR_REPO }}:${{ github.sha }}-amd64 ${{ env.GHCR_REPO }}:${{ github.sha }}-arm64
9087
docker manifest push ${tag}
9188
done

.github/workflows/current.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- main
66
- dev
7+
- 'release/**'
78
paths-ignore:
89
- "*.md"
910
- "LICENSE"
@@ -17,6 +18,5 @@ jobs:
1718
uses: ./.github/workflows/build-docker.yml
1819
with:
1920
tags: |
20-
type=raw,value=current
2121
type=ref,event=branch
2222
type=sha

.github/workflows/lint-web.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ jobs:
3030
- name: Lint
3131
working-directory: ./web
3232
run: pnpm lint
33+
- name: Audit
34+
working-directory: ./web
35+
run: pnpm audit --prod

.github/workflows/test.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121

2222
jobs:
2323
test:
24-
runs-on: [self-hosted, Linux]
24+
runs-on: [self-hosted, Linux, X64]
2525
container: rust:1
2626

2727
steps:
@@ -39,5 +39,11 @@ jobs:
3939
run: |
4040
rustup component add rustfmt
4141
cargo fmt -- --check
42+
- name: Run clippy linter
43+
run: |
44+
rustup component add clippy
45+
cargo clippy --all-targets --all-features -- -D warnings
46+
- name: Run cargo deny
47+
uses: EmbarkStudios/cargo-deny-action@v2
4248
- name: Run tests
4349
run: cargo test --locked --no-fail-fast

0 commit comments

Comments
 (0)