@@ -128,10 +128,11 @@ jobs:
128128
129129 # Get Qt
130130 - name : Install Qt 6
131+ id : qt-inst
131132 uses : jurplel/install-qt-action@v4
132133 with :
133134 modules : " qtpositioning qtwebchannel qtwebengine qtwebsockets"
134- version : " 6.9 .0"
135+ version : " 6.11 .0"
135136
136137 # Install Elixir on Ubuntu
137138 - name : Linux Elixir
@@ -163,7 +164,7 @@ jobs:
163164 working-directory : ${{github.workspace}}/app
164165 env :
165166 CC : ${{ matrix.cc }}
166- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
167+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
167168 run : |
168169 sudo apt install -y pulseaudio dbus-x11 libssl-dev ruby-dev supercollider-server sc3-plugins-server alsa-base alsa-utils jackd2 libjack-jackd2-dev libjack-jackd2-0 libasound2-dev librtmidi-dev pulseaudio-module-jack autoconf automake libtool-bin gettext pkg-config m4 libaubio-dev libpng-dev libboost-all-dev libxrandr-dev libxinerama-dev libxcursor-dev libxcomposite-dev libxext-dev libxrender-dev libfreetype6-dev libfontconfig1-dev libwebkit2gtk-4.1-dev libcurl4-openssl-dev libgtk-3-dev libglu1-mesa-dev
169170 ./linux-prebuild.sh
@@ -174,26 +175,33 @@ jobs:
174175 working-directory : ${{github.workspace}}/app
175176 env :
176177 CC : ${{ matrix.cc }}
177- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
178+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
178179 run : |
179180 ./mac-prebuild.sh
180181 if : matrix.os == 'macos-latest'
181182
182- # Prebuild on Windows
183- # Hide both system msys64 and the msys64 bundled inside setup-ruby's
184- # install — vcpkg's libflac build picks up whichever cmake.exe it
185- # finds first on PATH, and the mingw cmake from msys64 can't build
186- # an MSVC triplet.
183+ # Hide every msys64 dir (system root + the one bundled in setup-ruby's
184+ # tool-cache install) before vcpkg runs. Otherwise vcpkg's libflac port
185+ # picks up the mingw cmake.exe from msys64 and the MSVC-triplet build
186+ # blows up. Done in bash so we can find them all reliably regardless
187+ # of where the Ruby tool-cache lives.
188+ - name : Hide msys64 from PATH (Windows)
189+ shell : bash
190+ run : |
191+ set -x
192+ [ -d /c/msys64 ] && mv /c/msys64 /c/__msys64 || true
193+ find /c/hostedtoolcache -maxdepth 5 -type d -name msys64 -print0 2>/dev/null \
194+ | xargs -0 -I{} mv {} {}.__hidden || true
195+ where cmake || true
196+ if : startsWith(matrix.os, 'windows')
197+
187198 - name : Prebuild Windows
188199 working-directory : ${{github.workspace}}/app
189200 shell : cmd
190201 env :
191202 CC : ${{ matrix.cc }}
192- QT_INSTALL_LOCATION : ${{env.Qt6_DIR}}
193- RUBY_PREFIX : ${{steps.ruby-inst.outputs.ruby-prefix}}
203+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath}}
194204 run : |
195- if exist "c:\msys64" mv c:/msys64 c:/__msys64
196- if exist "%RUBY_PREFIX%\msys64" mv "%RUBY_PREFIX%\msys64" "%RUBY_PREFIX%\__msys64"
197205 win-prebuild.bat
198206 if : startsWith(matrix.os, 'windows')
199207
@@ -205,7 +213,7 @@ jobs:
205213 working-directory : ${{github.workspace}}/app
206214 env :
207215 CC : ${{ matrix.cc }}
208- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
216+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
209217 run : |
210218 ./linux-config.sh --config ${{ matrix.build_type }}
211219 if : matrix.os == 'ubuntu-latest'
@@ -215,7 +223,7 @@ jobs:
215223 working-directory : ${{github.workspace}}/app
216224 env :
217225 CC : ${{ matrix.cc }}
218- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
226+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
219227 run : |
220228 ./mac-config.sh --config ${{ matrix.build_type }}
221229 if : matrix.os == 'macos-latest'
@@ -226,7 +234,7 @@ jobs:
226234 shell : cmd
227235 env :
228236 CC : ${{ matrix.cc }}
229- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
237+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
230238 run : |
231239 win-config.bat ${{ matrix.build_type }}
232240 if : startsWith(matrix.os, 'windows')
@@ -423,10 +431,11 @@ jobs:
423431 uses : lukka/get-cmake@v4.0.2
424432
425433 - name : Install Qt 6
434+ id : qt-inst
426435 uses : jurplel/install-qt-action@v4
427436 with :
428437 modules : " qtpositioning qtwebchannel qtwebengine qtwebsockets"
429- version : " 6.9 .0"
438+ version : " 6.11 .0"
430439
431440 - name : Install Erlang/Elixir
432441 uses : erlef/setup-beam@v1
@@ -454,13 +463,13 @@ jobs:
454463 - name : Prebuild
455464 working-directory : ${{github.workspace}}/app
456465 env :
457- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
466+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
458467 run : ./linux-prebuild.sh
459468
460469 - name : Configure
461470 working-directory : ${{github.workspace}}/app
462471 env :
463- QT_INSTALL_LOCATION : ${{env.Qt6_DIR }}
472+ QT_INSTALL_LOCATION : ${{steps.qt-inst.outputs.qtPath }}
464473 run : ./linux-config.sh --config Release
465474
466475 - name : Build GUI
0 commit comments