From 2d593e7d29428974c9a32c96ee25e07efd397136 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Sun, 30 Jun 2024 20:51:41 +0000 Subject: [PATCH] remove unused pbsversion option from buildtest worklfow --- .github/workflows/buildtest.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index d62baea..0dc6764 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -44,21 +44,18 @@ jobs: - name: Build packages run: | - if [[ "${{ github.event.inputs.version }}" =~ ^3. ]] || [[ "${GITHUB_REF_NAME}" =~ ^3. ]]; then - pbsversion="pbs3" - fi [ "${{ github.event.inputs.package }}" = "client" ] && package="client" if [ "${{ github.event.inputs.arch }}" = "arm64" ]; then if [ "${RUNNER_DEBUG}" = "1" ]; then - docker buildx build -o packages --build-arg buildoptions="cross github debug ${pbsversion} ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 -f .github/Dockerfile.crosscompile-arm64 . + docker buildx build -o packages --build-arg buildoptions="cross github debug ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 -f .github/Dockerfile.crosscompile-arm64 . else - docker buildx build -o packages --build-arg buildoptions="cross github ${pbsversion} ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 -f .github/Dockerfile.crosscompile-arm64 . + docker buildx build -o packages --build-arg buildoptions="cross github ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 -f .github/Dockerfile.crosscompile-arm64 . fi else if [ "${RUNNER_DEBUG}" = "1" ]; then - docker buildx build -o packages --build-arg buildoptions="github debug ${pbsversion} ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 . + docker buildx build -o packages --build-arg buildoptions="github debug ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 . else - docker buildx build -o packages --build-arg buildoptions="github ${pbsversion} ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 . + docker buildx build -o packages --build-arg buildoptions="github ${package}" --build-arg baseimage=${{ github.event.inputs.baseimage }} --platform linux/amd64 . fi fi echo "DEB_VERSION=$(dpkg --info packages/proxmox-backup-server_*.deb | sed -n '/Version/ s/[^:]\+: //p')" >> $GITHUB_ENV