From 268bd8f1a6e74dbc36245392a2b99f0ab3c7bead Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 8 Feb 2023 07:55:42 +0300 Subject: [PATCH 1/2] added deploy binaries that are not packed into the installer --- .github/workflows/deploy.yml | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ec9fa862..ca1dec7c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,12 +42,18 @@ jobs: export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin bash deploy/build_linux.sh - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_Linux + name: AmneziaVPN_Linux_installer path: deploy/AmneziaVPN_Linux_Installer retention-days: 3 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_Linux_unpacked + path: deploy/AppDir + retention-days: 3 # ------------------------------------------------------ @@ -97,12 +103,18 @@ jobs: set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" call deploy\\build_windows.bat - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_Windows + name: AmneziaVPN_Windows_installer path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe retention-days: 3 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_Windows_unpacked + path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release + retention-days: 3 # ------------------------------------------------------ @@ -225,12 +237,18 @@ jobs: export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin" bash deploy/build_macos.sh - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_MacOS + name: AmneziaVPN_MacOS_installer path: AmneziaVPN.dmg retention-days: 3 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_MacOS_unpacked + path: deploy/build/installer + retention-days: 3 # ------------------------------------------------------ From 1ef14e129fd228c534b7e77bbcff73b352b93217 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 9 Feb 2023 11:15:50 +0000 Subject: [PATCH 2/2] Update deploy.yml --- .github/workflows/deploy.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ca1dec7c..4fd8f553 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,13 +47,13 @@ jobs: with: name: AmneziaVPN_Linux_installer path: deploy/AmneziaVPN_Linux_Installer - retention-days: 3 + retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v3 with: name: AmneziaVPN_Linux_unpacked path: deploy/AppDir - retention-days: 3 + retention-days: 7 # ------------------------------------------------------ @@ -108,13 +108,13 @@ jobs: with: name: AmneziaVPN_Windows_installer path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe - retention-days: 3 + retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v3 with: name: AmneziaVPN_Windows_unpacked path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release - retention-days: 3 + retention-days: 7 # ------------------------------------------------------ @@ -242,13 +242,13 @@ jobs: with: name: AmneziaVPN_MacOS_installer path: AmneziaVPN.dmg - retention-days: 3 + retention-days: 7 - name: 'Upload unpacked artifact' uses: actions/upload-artifact@v3 with: name: AmneziaVPN_MacOS_unpacked - path: deploy/build/installer - retention-days: 3 + path: deploy/build/client/AmneziaVPN.app + retention-days: 7 # ------------------------------------------------------