From deb5c6588551d77b07dd5cbb9418b1086531852f Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sat, 22 Nov 2025 01:54:46 +0000 Subject: [PATCH] docker: Add conditions to set assert_linkage for Dockerfile.install ci: Check packages when using test branch. Signed-off-by: Jason Volk --- .github/workflows/main.yml | 2 +- docker/Dockerfile.install | 10 ++++++---- docker/bake.hcl | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d65854e..168f68c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: publish: ${{vars.PUBLISH != 'false'}} build_nix: ${{vars.BUILD_NIX != 'false'}} build_pkgs: ${{vars.BUILD_PKGS || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/test' || contains(github.ref, 'tags/v')}} - check_pkgs: ${{vars.CHECK_PKGS || 'false'}} + check_pkgs: ${{vars.CHECK_PKGS || github.ref == 'refs/heads/test'}} complement: ${{vars.COMPLEMENT != 'false'}} complement_runner: 'het' docker_repo: ${{vars.DOCKER_REPO}} diff --git a/docker/Dockerfile.install b/docker/Dockerfile.install index c1d419e6..0bdbf002 100644 --- a/docker/Dockerfile.install +++ b/docker/Dockerfile.install @@ -15,15 +15,17 @@ ENV src_path="${CARGO_TARGET_DIR}/${rust_target}/${cargo_target_profile}/tuwunel ENV dst_path="${install_prefix}/bin/tuwunel" COPY --from=bins $src_path $dst_path RUN <