Update for newer ghcup
This commit is contained in:
		
							parent
							
								
									487b049ae1
								
							
						
					
					
						commit
						5771daa5f1
					
				
							
								
								
									
										11
									
								
								.github/workflows/install-bindist.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										11
									
								
								.github/workflows/install-bindist.sh
									
									
									
									
										vendored
									
									
								
							@ -14,7 +14,14 @@ ghcup --version
 | 
			
		||||
which ghcup | grep foobarbaz
 | 
			
		||||
 | 
			
		||||
ghcup_fun() {
 | 
			
		||||
	ghcup -v --url-source="file:$METADATA_FILE" "$@"
 | 
			
		||||
	case "$(uname -s)" in
 | 
			
		||||
		MSYS_*|MINGW*)
 | 
			
		||||
			ghcup -v --url-source="file:${GITHUB_WORKSPACE//\\//}/$METADATA_FILE" "$@"
 | 
			
		||||
			;;
 | 
			
		||||
		*)
 | 
			
		||||
			ghcup -v --url-source="file://${GITHUB_WORKSPACE}/$METADATA_FILE" "$@"
 | 
			
		||||
			;;
 | 
			
		||||
	esac
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
case $TOOL in
 | 
			
		||||
@ -26,7 +33,6 @@ case $TOOL in
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
mkdir -p /tmp/install-bindist-ci
 | 
			
		||||
cp "$METADATA_FILE" /tmp/install-bindist-ci/
 | 
			
		||||
cd /tmp/install-bindist-ci
 | 
			
		||||
 | 
			
		||||
trap 'rm -rf -- /tmp/install-bindist-ci' EXIT
 | 
			
		||||
@ -62,7 +68,6 @@ case $TOOL in
 | 
			
		||||
			cd "$tmp_dir"
 | 
			
		||||
			cabal unpack "${test_package}"
 | 
			
		||||
			cd "${test_package}"
 | 
			
		||||
			cp "/tmp/install-bindist-ci/${METADATA_FILE}" .
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		# For all HLS GHC versions and the wrapper, run 'typecheck'
 | 
			
		||||
 | 
			
		||||
@ -7,7 +7,7 @@ package ghcup
 | 
			
		||||
source-repository-package
 | 
			
		||||
  type: git
 | 
			
		||||
  location: https://github.com/haskell/ghcup-hs.git
 | 
			
		||||
  tag: b1106985ec1173a0122f2781719e9bb1a85de257
 | 
			
		||||
  tag: 91ef2c7666d118bc6bd7d2fc2eeb7754081a9f3d
 | 
			
		||||
 | 
			
		||||
constraints: http-io-streams -brotli,
 | 
			
		||||
             any.aeson >= 2.0.1.0
 | 
			
		||||
 | 
			
		||||
@ -52,7 +52,7 @@ executable ghcup-gen
 | 
			
		||||
    , deepseq               ^>=1.4
 | 
			
		||||
    , filepath              ^>=1.4.2.1
 | 
			
		||||
    , ghcup                 ^>=0.1.19.0
 | 
			
		||||
    , haskus-utils-variant  ^>=3.2
 | 
			
		||||
    , haskus-utils-variant  ^>=3.3
 | 
			
		||||
    , libarchive            ^>=3.0.3.0
 | 
			
		||||
    , megaparsec            >=8.0.0      && <9.3
 | 
			
		||||
    , mtl                   ^>=2.2
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user