From 136982c9dc83e8cc0a0c48aa98022de358a6f906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 3 Jan 2024 22:28:33 +0100 Subject: [PATCH 1/2] Simplify artifacts download 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 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e386994..2a30d6e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,18 +149,14 @@ jobs: uses: actions/download-artifact@v4.1.0 id: download with: - path: download/ + path: ftl_builds/ + pattern: pihole-* + merge-multiple: true - 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 From 54041665b6b5bd68a73ab8a3b0f6395cbb2a9352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Wed, 3 Jan 2024 22:33:38 +0100 Subject: [PATCH 2/2] Account for api-docs 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a30d6e4..b93df030 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -133,7 +133,7 @@ jobs: if: github.event_name != 'pull_request' && matrix.platform == 'linux/amd64' uses: actions/upload-artifact@v4.0.0 with: - name: api-docs + name: pihole-api-docs path: 'api-docs.tar.gz' deploy: