diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 30fddaed..77b57945 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -31,6 +31,13 @@ jobs: runs-on: ubuntu-latest needs: test if: github.ref == 'refs/heads/main' + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm/v7 + - linux/arm64 steps: - uses: actions/checkout@v3 @@ -39,22 +46,21 @@ jobs: fetch-tags: true - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: "arm64,arm" + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: wagvpn password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: + context: . outputs: "type=registry,push=true" - platforms: linux/amd64,linux/arm/v6,linux/arm64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 tags: wagvpn/wag:latest diff --git a/internal/router/bpf_bpfeb.o b/internal/router/bpf_bpfeb.o index da3c2e9c..3dd877ee 100644 Binary files a/internal/router/bpf_bpfeb.o and b/internal/router/bpf_bpfeb.o differ diff --git a/internal/router/bpf_bpfel.o b/internal/router/bpf_bpfel.o index eb194a03..2effaa89 100644 Binary files a/internal/router/bpf_bpfel.o and b/internal/router/bpf_bpfel.o differ diff --git a/release_builder/Dockerfile b/release_builder/Dockerfile index b0299fb3..bc0b67c9 100644 --- a/release_builder/Dockerfile +++ b/release_builder/Dockerfile @@ -2,8 +2,8 @@ FROM debian:latest RUN apt update -y RUN apt upgrade -y RUN apt install -y make wget llvm clang gcc git npm gulp libbpf-dev libpam0g-dev -RUN wget https://go.dev/dl/go1.19.4.linux-amd64.tar.gz -RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.19.4.linux-amd64.tar.gz +RUN wget https://go.dev/dl/go1.21.3.linux-amd64.tar.gz +RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.3.linux-amd64.tar.gz ENV PATH="$PATH:/usr/local/go/bin" RUN mkdir -p /build/ RUN chmod 777 /build/