From c19196cdc15ccca632eda10ecddb363326a0a69a Mon Sep 17 00:00:00 2001 From: Tom Most Date: Mon, 26 Aug 2024 23:41:54 -0700 Subject: [PATCH 1/5] Generate .sha256sum files for release artifacts I am *very much* not confident that sha256sum is available on the Windows runner images, so unsure that this will work in its current form. --- .github/workflows/release.yaml | 4 +++- bin/package | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 845046afbc..2763c95180 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -99,7 +99,9 @@ jobs: if: ${{ startsWith(github.ref, 'refs/tags/') }} with: draft: false - files: ${{ steps.package.outputs.archive }} + files: | + ${{ steps.package.outputs.archive }} + ${{ steps.package.outputs.archive-checksum }} prerelease: ${{ steps.ref-type.outputs.value != 'release' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/bin/package b/bin/package index d7949224b6..28076599fa 100755 --- a/bin/package +++ b/bin/package @@ -45,10 +45,14 @@ case $OS in ARCHIVE=$DIST/just-$VERSION-$TARGET.tar.gz tar czf $ARCHIVE * echo "archive=$ARCHIVE" >> $GITHUB_OUTPUT + sha256sum $ARCHIVE > $ARCHIVE.sha256sum + echo "archive-checksum=$ARCHIVE.sha256sum" >> $GITHUB_OUTPUT ;; windows-latest) ARCHIVE=$DIST/just-$VERSION-$TARGET.zip 7z a $ARCHIVE * echo "archive=`pwd -W`/just-$VERSION-$TARGET.zip" >> $GITHUB_OUTPUT + sha256sum $ARCHIVE > $ARCHIVE.sha256sum + echo "archive-checksum=`pwd -W`/just-$VERSION-$TARGET.zip.sha256sum" >> $GITHUB_OUTPUT ;; esac From 589e2a2af669b30bb331f88f9ec3c3ed440e3201 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Tue, 27 Aug 2024 16:02:27 -0700 Subject: [PATCH 2/5] Drop the archive-checksum output --- .github/workflows/release.yaml | 2 +- bin/package | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2763c95180..8f987c01c0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -101,7 +101,7 @@ jobs: draft: false files: | ${{ steps.package.outputs.archive }} - ${{ steps.package.outputs.archive-checksum }} + ${{ steps.package.outputs.archive }}.sha256sum prerelease: ${{ steps.ref-type.outputs.value != 'release' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/bin/package b/bin/package index 28076599fa..38bd6d9832 100755 --- a/bin/package +++ b/bin/package @@ -46,13 +46,11 @@ case $OS in tar czf $ARCHIVE * echo "archive=$ARCHIVE" >> $GITHUB_OUTPUT sha256sum $ARCHIVE > $ARCHIVE.sha256sum - echo "archive-checksum=$ARCHIVE.sha256sum" >> $GITHUB_OUTPUT ;; windows-latest) ARCHIVE=$DIST/just-$VERSION-$TARGET.zip 7z a $ARCHIVE * echo "archive=`pwd -W`/just-$VERSION-$TARGET.zip" >> $GITHUB_OUTPUT sha256sum $ARCHIVE > $ARCHIVE.sha256sum - echo "archive-checksum=`pwd -W`/just-$VERSION-$TARGET.zip.sha256sum" >> $GITHUB_OUTPUT ;; esac From bc732dad747cf32710e500fa78eff326757253e5 Mon Sep 17 00:00:00 2001 From: Tom Most Date: Tue, 27 Aug 2024 16:04:23 -0700 Subject: [PATCH 3/5] Use shasum for portability --- bin/package | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/package b/bin/package index 38bd6d9832..2c639febb3 100755 --- a/bin/package +++ b/bin/package @@ -45,12 +45,13 @@ case $OS in ARCHIVE=$DIST/just-$VERSION-$TARGET.tar.gz tar czf $ARCHIVE * echo "archive=$ARCHIVE" >> $GITHUB_OUTPUT - sha256sum $ARCHIVE > $ARCHIVE.sha256sum ;; windows-latest) ARCHIVE=$DIST/just-$VERSION-$TARGET.zip 7z a $ARCHIVE * echo "archive=`pwd -W`/just-$VERSION-$TARGET.zip" >> $GITHUB_OUTPUT - sha256sum $ARCHIVE > $ARCHIVE.sha256sum ;; esac + +echo "Creating release .sha256sum..." +shasum -a 256 $ARCHIVE > $ARCHIVE.sha256sum From 2608536d7990d61db6fd1563440daa7d4b981335 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 27 Aug 2024 16:22:19 -0700 Subject: [PATCH 4/5] Use certutil on Windows --- bin/package | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/package b/bin/package index 2c639febb3..befb7d3c8b 100755 --- a/bin/package +++ b/bin/package @@ -45,13 +45,12 @@ case $OS in ARCHIVE=$DIST/just-$VERSION-$TARGET.tar.gz tar czf $ARCHIVE * echo "archive=$ARCHIVE" >> $GITHUB_OUTPUT + shasum -a 256 $ARCHIVE > $ARCHIVE.sha256sum ;; windows-latest) ARCHIVE=$DIST/just-$VERSION-$TARGET.zip 7z a $ARCHIVE * echo "archive=`pwd -W`/just-$VERSION-$TARGET.zip" >> $GITHUB_OUTPUT + certutil -hashfile $ARCHIVE SHA256 > $ARCHIVE.sha256sum ;; esac - -echo "Creating release .sha256sum..." -shasum -a 256 $ARCHIVE > $ARCHIVE.sha256sum From ae24aeea01481d1736d78f26d9d28ac8ebf32e38 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 27 Aug 2024 17:24:27 -0700 Subject: [PATCH 5/5] Try sha256sum on windows --- bin/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package b/bin/package index befb7d3c8b..32ea2a8b3f 100755 --- a/bin/package +++ b/bin/package @@ -51,6 +51,6 @@ case $OS in ARCHIVE=$DIST/just-$VERSION-$TARGET.zip 7z a $ARCHIVE * echo "archive=`pwd -W`/just-$VERSION-$TARGET.zip" >> $GITHUB_OUTPUT - certutil -hashfile $ARCHIVE SHA256 > $ARCHIVE.sha256sum + sha256sum $ARCHIVE > $ARCHIVE.sha256sum ;; esac