From 2d518dd1f96147690c1eadf58023cec3eb0e108a Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Mon, 27 Nov 2023 20:05:58 -0500 Subject: [PATCH] release: tweak how sha256sum is invoked The output would ideally just have the basename of the file and not a meaningless relative path. Fixes #2654 --- .github/workflows/release.yml | 12 +++++++----- CHANGELOG.md | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43fc553f..b10c0761 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -332,14 +332,15 @@ jobs: run: | cargo deb --profile deb --target ${{ env.TARGET }} version="${{ needs.create-release.outputs.version }}" - deb="target/${{ env.TARGET }}/debian/ripgrep_$version-1_amd64.deb" - echo "DEB=$deb" >> $GITHUB_ENV + echo "DEB_DIR=target/${{ env.TARGET }}/debian" >> $GITHUB_ENV + echo "DEB_NAME=ripgrep_$version-1_amd64.deb" >> $GITHUB_ENV - name: Create sha256 sum of deb file shell: bash run: | - sum="$DEB.sha256" - shasum -a 256 "$DEB" > "$sum" + cd "$DEB_DIR" + sum="$DEB_NAME.sha256" + shasum -a 256 "$DEB_NAME" > "$sum" echo "SUM=$sum" >> $GITHUB_ENV - name: Upload release archive @@ -347,5 +348,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash run: | + cd "$DEB_DIR" version="${{ needs.create-release.outputs.version }}" - gh release upload "$version" ${{ env.DEB }} ${{ env.SUM }} + gh release upload "$version" "$DEB_NAME" "$SUM" diff --git a/CHANGELOG.md b/CHANGELOG.md index a8e2207d..117ab170 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This is a patch release with a few small bug fixes. Bug fixes: +* [BUG #2654](https://github.com/BurntSushi/ripgrep/issues/2654): + Fix `deb` release sha256 sum file. * [BUG #2659](https://github.com/BurntSushi/ripgrep/issues/2659): Fix Fish shell completions. * [BUG #2662](https://github.com/BurntSushi/ripgrep/issues/2662):