diff --git a/.github/workflows/buildx-debian-arm64.yml b/.github/workflows/buildx-debian-arm64.yml index 45d011a..7a3660b 100644 --- a/.github/workflows/buildx-debian-arm64.yml +++ b/.github/workflows/buildx-debian-arm64.yml @@ -25,24 +25,8 @@ jobs: else docker buildx build -o packages --build-arg buildoptions="github" --platform linux/arm64 . fi - - name: Test packages - run: | - sudo apt install -y \ - ./packages/libjs-extjs_*_all.deb \ - ./packages/libjs-qrcodejs_*_all.deb \ - ./packages/libproxmox-acme-plugins_*_all.deb \ - ./packages/pbs-i18n_*_all.deb \ - ./packages/proxmox-backup-docs_*_all.deb \ - ./packages/proxmox-backup-server_*.deb \ - ./packages/proxmox-mini-journalreader_*.deb \ - ./packages/proxmox-widget-toolkit_*_all.deb \ - ./packages/pve-xtermjs_*.deb - sudo apt install -y \ - ./packages/proxmox-backup-client_*.deb - sudo apt install -y \ - ./packages/proxmox-backup-file-restore_*.deb - echo "DEB_VERSION=$(dpkg -s proxmox-backup-server | sed -n '/Version/ s/[^ ]\+ //p')" >> $GITHUB_ENV - echo "DEB_VERSION_UPSTREAM=$(dpkg -s proxmox-backup-server | sed -n '/Version/ s/[^ ]\+ \([0-9.]\+\)-[0-9]/\1/p')" >> $GITHUB_ENV + echo "DEB_VERSION=$(dpkg --info packages/proxmox-backup-server_*.deb | sed -n '/Version/ s/[^:]\+: //p')" >> $GITHUB_ENV + echo "DEB_VERSION_UPSTREAM=$(dpkg --info packages/proxmox-backup-server_*.deb | sed -n '/Version/ s/[^:]\+: \([0-9.]\+\)-[0-9]/\1/p')" >> $GITHUB_ENV - name: Release packages uses: ncipollo/release-action@v1 with: diff --git a/.github/workflows/client-buildx-arm64.yml b/.github/workflows/client-buildx-arm64.yml index 29e60bf..ca2ebf9 100644 --- a/.github/workflows/client-buildx-arm64.yml +++ b/.github/workflows/client-buildx-arm64.yml @@ -23,7 +23,3 @@ jobs: else docker buildx build -o packages --build-arg buildoptions="client" --platform linux/arm64 . fi - - name: Test packages - run: | - sudo apt install -y \ - ./packages/proxmox-backup-client_*.deb diff --git a/.github/workflows/server-buildx-arm64.yml b/.github/workflows/server-buildx-arm64.yml index 3ec1184..fa8cc86 100644 --- a/.github/workflows/server-buildx-arm64.yml +++ b/.github/workflows/server-buildx-arm64.yml @@ -23,19 +23,3 @@ jobs: else docker buildx build -o packages --platform linux/arm64 . fi - - name: Test packages - run: | - sudo apt install -y \ - ./packages/libjs-extjs_*_all.deb \ - ./packages/libjs-qrcodejs_*_all.deb \ - ./packages/libproxmox-acme-plugins_*_all.deb \ - ./packages/pbs-i18n_*_all.deb \ - ./packages/proxmox-backup-docs_*_all.deb \ - ./packages/proxmox-backup-server_*.deb \ - ./packages/proxmox-mini-journalreader_*.deb \ - ./packages/proxmox-widget-toolkit_*_all.deb \ - ./packages/pve-xtermjs_*.deb - sudo apt install -y \ - ./packages/proxmox-backup-client_*.deb - sudo apt install -y \ - ./packages/proxmox-backup-file-restore_*.deb diff --git a/Dockerfile b/Dockerfile index 13f624b..166d36e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,5 +18,24 @@ WORKDIR /build SHELL ["/bin/bash", "-c"] RUN source ~/.cargo/env && ./build.sh ${buildoptions} +RUN if [[ "${buildoptions}" =~ github ]]; then \ + apt-get -y install \ + /build/packages/proxmox-backup-client_*.deb; \ + if [[ ! "${buildoptions}" =~ "client" ]]; then \ + apt-get -y install \ + /build/packages/proxmox-backup-file-restore_*.deb; \ + apt-get -y install \ + /build/packages/libjs-extjs_*_all.deb \ + /build/packages/libjs-qrcodejs_*_all.deb \ + /build/packages/libproxmox-acme-plugins_*_all.deb \ + /build/packages/pbs-i18n_*_all.deb \ + /build/packages/proxmox-backup-docs_*_all.deb \ + /build/packages/proxmox-backup-server_*.deb \ + /build/packages/proxmox-mini-journalreader_*.deb \ + /build/packages/proxmox-widget-toolkit_*_all.deb \ + /build/packages/pve-xtermjs_*.deb; \ + fi \ + fi + FROM scratch COPY --from=builder-stage /build/*.log /build/packages/* /