Fixes

stable-haskell · Jun 29, 2024 · 40786e0 · 40786e0
1 parent 7686418
commit 40786e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/release/create-yaml-snippet.sh b/scripts/release/create-yaml-snippet.sh
@@ -7,7 +7,7 @@ RELEASE=$1
 VERSION=${RELEASE#cabal-install-v}
 
 cd "gh-release-artifacts/cabal-${VERSION}"
-BASE_URL=https://downloads.haskell.org/~cabal/cabal-install-$VERSION
+BASE_URL=https://downloads.haskell.org/ghcup/unofficial-bindists/cabal/$VERSION
 
 cat <<EOF > /dev/stdout
     $VERSION:
@@ -50,10 +50,10 @@ cat <<EOF > /dev/stdout
             '< 33': &cabal-${VERSION//./}-64-fedora27
               dlUri: ${BASE_URL}/cabal-install-$VERSION-x86_64-linux-fedora27.tar.xz
               dlHash: $(sha256sum "cabal-install-$VERSION-x86_64-linux-fedora27.tar.xz" | awk '{ print $1 }')
-			'(>= 33 && < 37)': &cabal-${VERSION//./}-64-fedora33
+            '(>= 33 && < 37)': &cabal-${VERSION//./}-64-fedora33
               dlUri: ${BASE_URL}/cabal-install-$VERSION-x86_64-linux-fedora33.tar.xz
               dlHash: $(sha256sum "cabal-install-$VERSION-x86_64-linux-fedora33.tar.xz" | awk '{ print $1 }')
-			'>= 37': &cabal-${VERSION//./}-64-fedora37
+            '>= 37': &cabal-${VERSION//./}-64-fedora37
               dlUri: ${BASE_URL}/cabal-install-$VERSION-x86_64-linux-fedora37.tar.xz
               dlHash: $(sha256sum "cabal-install-$VERSION-x86_64-linux-fedora37.tar.xz" | awk '{ print $1 }')
             unknown_versioning: *cabal-${VERSION//./}-64-fedora27

diff --git a/scripts/release/download-gh-artifacts.sh b/scripts/release/download-gh-artifacts.sh
@@ -18,7 +18,7 @@ done
 
 mkdir -p "gh-release-artifacts/cabal-${VERSION}"
 
-git archive --format=tar.gz -o "gh-release-artifacts/${RELEASE}/cabal-${TAG}-src.tar.gz" --prefix="cabal-${TAG}/" HEAD
+git archive --format=tar.gz -o "gh-release-artifacts/cabal-${VERSION}/cabal-${VERSION}-src.tar.gz" --prefix="cabal-${VERSION}/" HEAD
 
 cd "gh-release-artifacts/cabal-${VERSION}"
 
@@ -28,5 +28,5 @@ gh release download "$RELEASE"
 sha256sum ./* > SHA256SUMS
 gpg --detach-sign -u "${SIGNER}" SHA256SUMS
 
-gh release upload "$RELEASE" "cabal-${TAG}-src.tar.gz" SHA256SUMS SHA256SUMS.sig
+gh release upload "$RELEASE" "cabal-${VERSION}-src.tar.gz" SHA256SUMS SHA256SUMS.sig