build Qt from CCI fork

Author: kambala-decapitator

.github/workflows/rebuildDependencies.yml

@@ -128,22 +128,11 @@ jobs:
 
     - name: Build recipes with our patches
       run: |
-        echo "CONAN_HOME=$(conan config home)" >> $GITHUB_ENV
-        echo "UPLOAD_QT=1" >> $GITHUB_ENV
-        set -x
         cciRepo='conan-center-index'
         branchName='master'
         recipePathQt='recipes/qt'
         custom_patches_path="$(pwd)/deps/conan_patches"
 
-        #extraAndroidOptions="-o qt/*:android_sdk=$ANDROID_HOME"
-        #extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"-o qt/*:android_sdk=$ANDROID_HOME"' || '' }}
-
-        function slash_to_backslash {
-          slash=/
-          echo "${1//$slash/\\}"
-        }
-
         git clone "https://github.com/conan-io/$cciRepo.git" \
           --branch "$branchName" \
           --no-checkout \
@@ -155,13 +144,12 @@ jobs:
         git sparse-checkout set \
           recipes/minizip \
           recipes/flac \
-          $recipePathQt \
 
         git checkout
 
         # versions must be synced with: conan_patches/<package>/conandata.yml
         # if no custom patches are required for a package, it should be removed from here
-        for p in minizip/1.3.1 flac/1.4.2 qt/5.15.16 ; do
+        for p in minizip/1.3.1 flac/1.4.2 ; do
           IFS_OLD="$IFS"
           IFS=/
           read package version <<<"$p"
@@ -173,33 +161,21 @@ jobs:
             packagePath="recipes/$package/all"
           fi
 
-          conanCreateCommand="conan create $packagePath \
+          conan create $packagePath \
             --version=$version \
             --profile=../CI/conan/${{ matrix.conan_profile }} \
             --build=missing \
             --test-folder= \
-            --core-conf core.sources.patch:extra_path=$custom_patches_path \
-          "
-          # $(slash_to_backslash "$conanCreateCommand")
-          # 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"' || '' }}
+            --core-conf core.sources.patch:extra_path=$custom_patches_path
         done
-        echo "UPLOAD_QT=0" >> $GITHUB_ENV
 
-    - name: Upload Qt
-      if: ${{ always() && env.UPLOAD_QT == 1 }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.platform }}-qt
-        path: |
-          ${{ env.CONAN_HOME }}/p/b/qt*
-
-    # TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged
-    - name: Build LuaJIT from PR changes
+    # TODO: remove LuaJIT when https://github.com/conan-io/conan-center-index/pull/26577 is merged
+    - name: Build LuaJIT & Qt from PR changes
       run: |
         cciForkRepo='cci-fork'
-        branchName='package/luajit'
-        recipePath='recipes/luajit'
+        branchName='vcmi'
+        recipePathQt='recipes/qt'
+        custom_patches_path="$(pwd)/deps/conan_patches"
 
         git clone "https://github.com/kambala-decapitator/conan-center-index.git" "$cciForkRepo" \
           --branch "$branchName" \
@@ -209,14 +185,33 @@ jobs:
           --single-branch \
           --sparse
         cd "$cciForkRepo"
-        git sparse-checkout set "$recipePath"
+        git sparse-checkout set \
+          recipes/luajit \
+          $recipePathQt \
+
         git checkout
 
-        conan create "$recipePath/all" \
-          --version=2.1.0-beta3 \
-          --profile=../CI/conan/${{ matrix.conan_profile }} \
-          --build=missing \
-          --test-folder=''
+        for p in luajit/2.1.0-beta3 qt/5.15.16 ; do
+          IFS_OLD="$IFS"
+          IFS=/
+          read package version <<<"$p"
+          IFS="$IFS_OLD"
+
+          if [[ $package == qt ]] ; then
+            packagePath="$recipePathQt/5.x.x"
+          else
+            packagePath="recipes/$package/all"
+          fi
+
+          # Windows workaround for https://bugreports.qt.io/browse/QTBUG-84543
+          PATH="/c/Strawberry/perl/bin:$PATH" conan create $packagePath \
+            --version=$version \
+            --profile=../CI/conan/${{ matrix.conan_profile }} \
+            --build=missing \
+            --test-folder= \
+            --core-conf core.sources.patch:extra_path=$custom_patches_path \
+            ${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
+        done
 
     - name: Generate conan profile
       run: |
@@ -226,16 +221,6 @@ jobs:
           --profile=CI/conan/${{ matrix.conan_profile }} \
           ${{ matrix.conan_options }} || true
 
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.platform }}
-        path: |
-          ${{ env.CONAN_HOME }}/p/b/ffmp*/b/build-release
-          ${{ env.CONAN_HOME }}/p/zlib*/p
-
-    - run: exit 1
-
     - name: Remove builds and source code
       run: conan cache clean