From a1cf6e4ff05fe3dd0006daaff9bd8d3cd986f2b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sat, 16 Dec 2023 23:14:42 +0100 Subject: [PATCH] Adjust workflow for upload/download v4 changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- .github/workflows/build.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 766931f5..b6a2d586 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -121,7 +121,7 @@ jobs: if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4.0.0 with: - name: tmp-storage + name: ${{ matrix.bin_name }}-binary path: '${{ matrix.bin_name }}*' - name: Extract documentation files from container @@ -133,7 +133,7 @@ jobs: if: github.event_name != 'pull_request' && matrix.platform == 'linux/amd64' uses: actions/upload-artifact@v4.0.0 with: - name: tmp-storage + name: api-docs path: 'api-docs.tar.gz' deploy: @@ -146,15 +146,21 @@ jobs: uses: actions/checkout@v4.1.1 - name: Get Binaries and documentation built in previous jobs - uses: actions/download-artifact@v3.0.2 + uses: actions/download-artifact@v4.0.0 id: download with: - name: tmp-storage - path: ftl-builds/ + path: download/ - name: Display structure of downloaded files run: ls -R working-directory: ${{steps.download.outputs.download-path}} + + - + name: Copy all artifacts from sub-directories to ftl_builds/ + run: | + mkdir ftl_builds/ + cp ${{steps.download.outputs.download-path}}/**/* ftl_builds/ + - name: Install SSH Key uses: benoitchantre/setup-ssh-authentication-action@1.0.1 @@ -163,14 +169,14 @@ jobs: known-hosts: ${{ secrets.KNOWN_HOSTS }} - name: Untar documentation files - working-directory: ${{steps.download.outputs.download-path}} + working-directory: ftl_builds/ run: | mkdir docs/ tar xzvf api-docs.tar.gz -C docs/ - name: Display structure of files ready for upload run: ls -R - working-directory: ${{steps.download.outputs.download-path}} + working-directory: ftl_builds/ - name: Transfer Builds to Pi-hole server for pihole checkout if: github.actor != 'dependabot[bot]' @@ -178,7 +184,7 @@ jobs: USER: ${{ secrets.SSH_USER }} HOST: ${{ secrets.SSH_HOST }} TARGET_DIR: ${{ needs.smoke-tests.outputs.OUTPUT_DIR }} - SOURCE_DIR: ${{ steps.download.outputs.download-path }} + SOURCE_DIR: ftl_builds/ run: | bash ./deploy.sh - @@ -187,4 +193,4 @@ jobs: uses: softprops/action-gh-release@v1 with: files: | - ${{ steps.download.outputs.download-path }}/* + ftl_builds/*