ci: Use SDK build image MinGW-w64 installation

This commit updates the CI workflow to use the more up-to-date MinGW-w64 toolchain from the SDK build Docker image instead of installing the outdated distro default version. Signed-off-by: Stephanos Ioannidis <[email protected]>
zephyrproject-rtos · Oct 24, 2024 · 7830f36 · 7830f36
1 parent 11ce031
commit 7830f36
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -475,9 +475,14 @@ jobs:
 
         # Install dependencies for cross compilation
         if [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
-          # Install MinGW-w64 cross toolchain
-          sudo apt-get install -y binutils-mingw-w64 gcc-mingw-w64 \
-                                  g++-mingw-w64
+          # Make MinGW-w64 win32 cross toolchain available in PATH
+          echo "/opt/mingw-w64-win32/bin" >> $GITHUB_PATH
+          export PATH="/opt/mingw-w64-win32/bin:$PATH"
+
+          # DEBUG++
+          echo $PATH
+          x86_64-w64-mingw32-g++ -v
+          # DEBUG--
 
           # Build and install libboost-regex for MinGW-w64 host
           ## Check out Boost library source code
@@ -833,9 +838,8 @@ jobs:
 
         # Install dependencies for cross compilation
         if [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
-          # Install MinGW-w64 cross toolchain
-          sudo apt-get install -y binutils-mingw-w64 gcc-mingw-w64 \
-                                  g++-mingw-w64
+          # Make MinGW-w64 posix cross toolchain available in PATH
+          echo "/opt/mingw-w64-posix/bin" >> $GITHUB_PATH
         fi
 
         # Set environment variables