Skip to content

Commit cf6717d

Browse files
geekosaurmergify[bot]
authored andcommitted
final fixups to sdist check
validated on 3.12 branch and applied in backport of #10448; this brings the fixes up to `master` (cherry picked from commit 8e076b6)
1 parent 99386c1 commit cf6717d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/check-sdist.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ jobs:
6868
# (don't look at this too closely)
6969
sdist="$(ls dist-newstyle/sdist/cabal-install-*.tar.gz | sed -n '\,^dist-newstyle/sdist/cabal-install-[0-9.]*\.tar\.gz$,{;p;q;}')"
7070
# extract the cabal-install major version
71-
ver="$(echo "$sdist" | sed -n 's,^dist-newstyle/sdist/cabal-install-\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9.]*$,\1,p')"
71+
ver="$(echo "$sdist" | sed -n 's,^dist-newstyle/sdist/cabal-install-\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9.]*\.tar\.gz$,\1,p')"
7272
# dunno if this will ever be extended to freebsd, but grep -q is a gnu-ism
73-
if ghc-pkg --global --simple-output list Cabal | grep "^Cabal-$cbl\\." >/dev/null; then
73+
if ghc-pkg --global --simple-output list Cabal | grep "^Cabal-$ver\\." >/dev/null; then
7474
# sigh, someone broke installing from tarballs
7575
rm -rf cabal*.project Cabal Cabal-syntax cabal-install-solver cabal-install
7676
tar xfz "$sdist"

0 commit comments

Comments
 (0)