File tree Expand file tree Collapse file tree 1 file changed +13
-7
lines changed Expand file tree Collapse file tree 1 file changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -143,18 +143,23 @@ jobs:
143143 curl --no-progress-meter https://jdk.java.net/javafx${{ env.javafx }}/ > javafx.html
144144
145145 case "${{ matrix.os }}" in
146- "ubuntu-latest ")
147- OS="linux"
146+ "ubuntu-22.04 ")
147+ OS="linux-x64 "
148148 EXTRACT="tar xzf *.tar.gz"
149149 EXT="tar.gz"
150150 ;;
151151 "windows-latest")
152- OS="windows"
152+ OS="windows-x64 "
153153 EXTRACT="unzip -qq *.zip"
154154 EXT="zip"
155155 ;;
156- "macos-latest")
157- OS="macos"
156+ "macos-13")
157+ OS="macos-x64"
158+ EXTRACT="tar xzf *.tar.gz"
159+ EXT="tar.gz"
160+ ;;
161+ "macos-14")
162+ OS="macos-aarch64"
158163 EXTRACT="tar xzf *.tar.gz"
159164 EXT="tar.gz"
160165 ;;
@@ -165,19 +170,20 @@ jobs:
165170 esac
166171 echo "OS set to $OS"
167172
168- URL_SDK=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}-x64_bin -sdk.${EXT}" javafx.html | head -n 1)
173+ URL_SDK=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}_bin -sdk.${EXT}" javafx.html | head -n 1)
169174 echo "Downloading $URL_SDK..."
170175 curl -OJ --no-progress-meter $URL_SDK
171176 $EXTRACT
172177 rm *.$EXT
173178
174- URL_JMODS=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}-x64_bin -jmods.${EXT}" javafx.html | head -n 1)
179+ URL_JMODS=$(grep -o "https://download.java.net/java/.*/javafx.*${OS}_bin -jmods.${EXT}" javafx.html | head -n 1)
175180 echo "Downloading $URL_JMODS..."
176181 curl -OJ --no-progress-meter $URL_JMODS
177182 $EXTRACT
178183 rm *.$EXT
179184 - name : ' Set JavaFX ${{ env.javafx }} (linux, Windows)'
180185 if : (matrix.os != 'macos-13') && (matrix.os != 'macos-14') && (matrix.os != 'buildjet-8vcpu-ubuntu-2204-arm')
186+ shell : bash
181187 run : |
182188 set -e
183189 shopt -s globstar
You can’t perform that action at this time.
0 commit comments