From 0e06668c7141caa46112fa9c5c35f7794b0ca965 Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Tue, 30 Jan 2024 13:24:20 +0100 Subject: [PATCH 1/4] github: downgrade download-artifact to v3 The download-artifact version v4 is incompatible with artifacts produced by upload-artifact@v3. Signed-off-by: Maciek Borzecki --- .github/workflows/buildrepo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildrepo.yaml b/.github/workflows/buildrepo.yaml index 6506027..2832c7c 100644 --- a/.github/workflows/buildrepo.yaml +++ b/.github/workflows/buildrepo.yaml @@ -76,11 +76,11 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v4 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: repo-tarball-amazonlinux-2 path: repo/amzn2 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: name: repo-tarball-amazonlinux-2023 path: repo/al2023 From 2e9f78304182bc579daacdf6f324cc640b4dd20d Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Tue, 30 Jan 2024 13:26:15 +0100 Subject: [PATCH 2/4] github: set artifact retention days Signed-off-by: Maciek Borzecki --- .github/workflows/buildrepo.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/buildrepo.yaml b/.github/workflows/buildrepo.yaml index 2832c7c..a69e3f3 100644 --- a/.github/workflows/buildrepo.yaml +++ b/.github/workflows/buildrepo.yaml @@ -64,6 +64,7 @@ jobs: with: name: ${{ matrix.artifact_name }} path: "amazon-linux-*-repo*.tar.xz" + retention-days: 1 deploy: needs: From 30d2b9873cfd2befaf9405651e04a3bf361ff546 Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Tue, 30 Jan 2024 13:36:49 +0100 Subject: [PATCH 3/4] github: download all artifacts Signed-off-by: Maciek Borzecki --- .github/workflows/buildrepo.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/buildrepo.yaml b/.github/workflows/buildrepo.yaml index a69e3f3..f1b54a3 100644 --- a/.github/workflows/buildrepo.yaml +++ b/.github/workflows/buildrepo.yaml @@ -78,13 +78,6 @@ jobs: uses: actions/configure-pages@v4 - uses: actions/download-artifact@v3 - with: - name: repo-tarball-amazonlinux-2 - path: repo/amzn2 - - uses: actions/download-artifact@v3 - with: - name: repo-tarball-amazonlinux-2023 - path: repo/al2023 - name: Show the artifacts run: | From b101c2c5ee70a8a9dfba03485c2b36bdcb61055c Mon Sep 17 00:00:00 2001 From: Maciek Borzecki Date: Tue, 30 Jan 2024 13:36:58 +0100 Subject: [PATCH 4/4] github: tweak the pages content prepare step Signed-off-by: Maciek Borzecki --- .github/workflows/buildrepo.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildrepo.yaml b/.github/workflows/buildrepo.yaml index f1b54a3..f38525e 100644 --- a/.github/workflows/buildrepo.yaml +++ b/.github/workflows/buildrepo.yaml @@ -79,8 +79,12 @@ jobs: - uses: actions/download-artifact@v3 - - name: Show the artifacts + - name: Prepare the artifacts run: | + find . -ls + mkdir -p repo/amzn2 repo/al2023 + tar -C repo/amzn2 --strip-components=1 -xvf repo-tarball-amazonlinux-2/amazon-linux-2-repo.tar.xz + tar -C repo/al2023 --strip-components=1 -xvf repo-tarball-amazonlinux-2023/amazon-linux-2023-repo.tar.xz find repo/ -ls - name: Upload artifact