Fix windows ghcup test script
This commit is contained in:
		
							parent
							
								
									ca92b29ffe
								
							
						
					
					
						commit
						4b338ccfd8
					
				
							
								
								
									
										2
									
								
								.github/scripts/common.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/scripts/common.sh
									
									
									
									
										vendored
									
									
								
							@ -44,7 +44,7 @@ raw_eghcup() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
eghcup() {
 | 
					eghcup() {
 | 
				
			||||||
	if [ "${OS}" = "Windows" ] ; then
 | 
						if [ "${OS}" = "Windows" ] ; then
 | 
				
			||||||
		"$GHCUP_BIN/ghcup${ext}" -c -s "file:/$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
 | 
							"$GHCUP_BIN/ghcup${ext}" -c -s "file:${GITHUB_WORKSPACE//\\//}/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		"$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
 | 
							"$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										1
									
								
								.github/scripts/test.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/scripts/test.sh
									
									
									
									
										vendored
									
									
								
							@ -11,6 +11,7 @@ else
 | 
				
			|||||||
	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
 | 
						GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					env
 | 
				
			||||||
git_describe
 | 
					git_describe
 | 
				
			||||||
 | 
					
 | 
				
			||||||
rm -rf "${GHCUP_DIR}"
 | 
					rm -rf "${GHCUP_DIR}"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user