From b5318564c919ce97f6149fd6707a68c3772852f8 Mon Sep 17 00:00:00 2001 From: Peter Law Date: Sat, 3 Aug 2024 11:33:54 +0100 Subject: [PATCH] Use a consistent mechanism to upload our reference build Something changed recently in how actions/upload-artifact creates its archives, such that symlinked files behaved differently under that action than under actions/upload-pages-artifact. This broke our diffing logic. Move to using the same upload approach for both the local and reference main builds, to avoid spurious errors. --- .github/workflows/publish.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1e64bf54..70b6e20b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -82,11 +82,10 @@ jobs: - name: Build run: rake build - - name: Upload build site - uses: actions/upload-artifact@v4 + - name: Upload reference artifact + uses: actions/upload-pages-artifact@v3 with: name: build-from-main - path: _site diff: runs-on: ubuntu-latest @@ -113,7 +112,14 @@ jobs: uses: actions/download-artifact@v4 with: name: build-from-main - path: main + + - name: Unpack main build + run: | + mkdir main + pushd main + tar --extract --file ../artifact.tar + popd + mv artifact.tar main.tar - name: Diff id: diff