Update rebuildDependencies.yml

Author: kambala-decapitator

.github/workflows/rebuildDependencies.yml

@@ -13,30 +13,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - platform: mac-intel
-          #   os: macos-14
-          #   before_install: macos.sh
-          #   conan_profile: macos-intel
-          #   conan_system_libs: bzip2 libiconv sqlite3 zlib
-          # - platform: mac-arm
-          #   os: macos-14
-          #   before_install: macos.sh
-          #   conan_profile: macos-arm
-          #   conan_system_libs: bzip2 libiconv sqlite3 zlib
-          # - platform: ios
-          #   os: macos-14
-          #   before_install: macos.sh
-          #   conan_profile: ios-arm64
-          #   conan_system_libs: bzip2 libiconv sqlite3 zlib
-          # - platform: android-armeabi-v7a
-          #   os: ubuntu-24.04
-          #   before_install: android.sh
-          #   conan_profile: android-32-ndk
-          #   conan_system_libs: zlib
-          # - platform: android-arm64-v8a
-          #   os: ubuntu-24.04
-          #   conan_profile: android-64-ndk
-          #   conan_system_libs: zlib
+          - platform: mac-intel
+            os: macos-14
+            before_install: macos.sh
+            conan_profile: macos-intel
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: mac-arm
+            os: macos-14
+            before_install: macos.sh
+            conan_profile: macos-arm
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: ios
+            os: macos-14
+            before_install: macos.sh
+            conan_profile: ios-arm64
+            conan_system_libs: bzip2 libiconv sqlite3 zlib
+          - platform: android-armeabi-v7a
+            os: ubuntu-24.04
+            before_install: android.sh
+            conan_profile: android-32-ndk
+            conan_system_libs: zlib
+          - platform: android-arm64-v8a
+            os: ubuntu-24.04
+            conan_profile: android-64-ndk
+            conan_system_libs: zlib
           - platform: windows-x64
             os: windows-2022
             # before_install: msvc.sh
@@ -121,7 +121,7 @@ jobs:
         custom_patches_path="$cwdNative/deps/conan_patches"
 
         #extraAndroidOptions="-o qt/*:android_sdk=$ANDROID_HOME"
-        extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"-o qt/*:android_sdk=$ANDROID_HOME"' || '' }}
+        #extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"-o qt/*:android_sdk=$ANDROID_HOME"' || '' }}
 
         function slash_to_backslash {
           slash=/
@@ -153,7 +153,6 @@ jobs:
             packagePath="recipes/$package/all"
           fi
 
-          # must run in the native platform shell: Qt doesn't build in bash on Windows
           conanCreateCommand="conan create $packagePath \
             --version=$version \
             --profile=../CI/conan/${{ matrix.conan_profile }} \
@@ -162,9 +161,8 @@ jobs:
             --core-conf core.sources.patch:extra_path=$custom_patches_path \
           "
           # $(slash_to_backslash "$conanCreateCommand")
-          ${{ startsWith(matrix.platform, 'windows') && 'cmd //C "$conanCreateCommand"'
-            || '$conanCreateCommand $extraOptionsBash'
-          }}
+          # Windows workaround for https://bugreports.qt.io/browse/QTBUG-84543
+          PATH="/c/Strawberry/perl/bin:$PATH" $conanCreateCommand ${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
         done
         exit 1