Skip to content

Commit 82fc505

Browse files
authored
fix for msys2 recent change of OSTYPE from msys to cygwin (VirtusLab#3513)
1 parent 50c930c commit 82fc505

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/scripts/generate-native-image.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ COMMAND="cli[].base-image.writeNativeImageScript"
88
export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
99

1010
# Using 'mill -i' so that the Mill process doesn't outlive this invocation
11-
12-
if [[ "$OSTYPE" == "msys" ]]; then
11+
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
1312
./mill.bat -i ci.copyJvm --dest jvm
1413
export JAVA_HOME="$(pwd -W | sed 's,/,\\,g')\\jvm"
1514
export GRAALVM_HOME="$JAVA_HOME"

.github/scripts/generate-os-packages.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ generate_sdk() {
127127
sdkDirectory="scala-cli-x86_64-apple-darwin-sdk"
128128
fi
129129
binName="scala-cli"
130-
elif [[ "$OSTYPE" == "msys" ]]; then
130+
elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
131131
sdkDirectory="scala-cli-x86_64-pc-win32-sdk"
132132
binName="scala-cli.exe"
133133
else
@@ -138,7 +138,7 @@ generate_sdk() {
138138
mkdir -p "$sdkDirectory"/bin
139139
cp "$(launcher)" "$sdkDirectory"/bin/"$binName"
140140

141-
if [[ "$OSTYPE" == "msys" ]]; then
141+
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
142142
7z a "$sdkDirectory".zip "$sdkDirectory"
143143
else
144144
zip -r "$sdkDirectory".zip "$sdkDirectory"
@@ -160,7 +160,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
160160
generate_pkg "x86_64"
161161
fi
162162
generate_sdk
163-
elif [[ "$OSTYPE" == "msys" ]]; then
163+
elif [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
164164
generate_msi
165165
generate_sdk
166166
else

0 commit comments

Comments
 (0)