Use INSTALL_QT_VERSION variable in workflows

opengisch · Nov 9, 2023 · f15c050 · f15c050
1 parent 3d6e89a
commit f15c050
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -61,16 +61,16 @@ jobs:
           BUILD_ROOT="/home/runner"
           echo "BUILD_ROOT=${BUILD_ROOT}" >> $GITHUB_ENV
           echo "BUILD_TYPE=Release" >> $GITHUB_ENV
-
           echo "CMAKE_BUILD_DIR=${BUILD_ROOT}/builddir" >> $GITHUB_ENV
+          echo "INSTALL_QT_VERSION=6.6.0" >> $GITHUB_ENV
 
       - name: 🐩 Install CMake and Ninja
         uses: lukka/get-cmake@latest
 
       - name: 💐 Install Qt (Android)
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.0
+          version: ${{ env.INSTALL_QT_VERSION }}
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtimageformats qtmultimedia qtwebview qtsensors'
           target: android
           arch: ${{ matrix.qt_arch }}
@@ -79,7 +79,7 @@ jobs:
       - name: 💐 Install Qt (Desktop)
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.0
+          version: ${{ env.INSTALL_QT_VERSION }}
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtimageformats qtmultimedia qtwebview qtsensors'
           target: desktop
           cache: false
@@ -129,8 +129,8 @@ jobs:
                 -D WITH_ALL_FILES_ACCESS="${{ matrix.all_files_access }}" \
                 -D WITH_SPIX=OFF \
                 -D CMAKE_PREFIX_PATH=${Qt6_DIR} \
-                -D QT_HOST_PATH=/home/runner/work/QField/Qt/6.6.0/gcc_64 \
-                -D QT_HOST_PATH_CMAKE_DIR:PATH=/home/runner/work/QField/Qt/6.6.0/gcc_64 \
+                -D QT_HOST_PATH=/home/runner/work/QField/Qt/${{ env.INSTALL_QT_VERSION }}/gcc_64 \
+                -D QT_HOST_PATH_CMAKE_DIR:PATH=/home/runner/work/QField/Qt/${{ env.INSTALL_QT_VERSION }}/gcc_64 \
                 -D APP_VERSION="${APP_VERSION}" \
                 -D APK_VERSION_CODE="${APK_VERSION_CODE}" \
                 -D APP_VERSION_STR="${APP_VERSION_STR}" \

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -25,12 +25,14 @@ jobs:
         with:
           submodules: recursive
 
-      - name: 🌾 Prepare vars
+      - name: 🌾 Prepare variables
         id: vars
         shell: bash
         run: |
           ./scripts/ci/env_gh.sh
 
+          echo "INSTALL_QT_VERSION=6.6.0" >> $GITHUB_ENV
+
       - uses: Apple-Actions/import-codesign-certs@v2
         with:
           p12-file-base64: ${{ env.CI_USE_IOS_DIST_CERT && secrets.APPLE_CODESIGN_CERT_BASE64_DIST || secrets.APPLE_CODESIGN_CERT_BASE64_DEV }}
@@ -46,15 +48,15 @@ jobs:
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.0
+          version: ${{ env.INSTALL_QT_VERSION }}
           modules: 'qt5compat qtcharts qtpositioning qtconnectivity qtimageformats qtmultimedia qtwebview qtsensors'
           target: ios
           cache: true
 
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.0
+          version: ${{ env.INSTALL_QT_VERSION }}
           target: desktop
           cache: false
 
@@ -110,8 +112,8 @@ jobs:
                 -D CMAKE_SYSTEM_NAME=iOS \
                 -D CMAKE_SYSTEM_PROCESSOR=aarch64 \
                 -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ env.DEPLOYMENT_TARGET }} \
-                -D QT_HOST_PATH=${{ github.workspace }}/../Qt/6.6.0/macos \
-                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/../Qt/6.6.0/macos \
+                -D QT_HOST_PATH=${{ github.workspace }}/../Qt/${{ env.INSTALL_QT_VERSION }}/macos \
+                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/../Qt/${{ env.INSTALL_QT_VERSION }}/macos \
                 -D ENABLE_TESTS=OFF \
                 -D CMAKE_CXX_VISIBILITY_PRESET=hidden \
                 -D WITH_CCACHE=ON

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           submodules: recursive
 
-      - name: 🌾 Prepare vars
+      - name: 🌾 Prepare variables
         id: vars
         run: |
           ./scripts/ci/env_gh.sh
@@ -30,6 +30,7 @@ jobs:
           echo "BUILD_ROOT=${BUILD_ROOT}" >> $GITHUB_ENV
           echo "BUILD_TYPE=Release" >> $GITHUB_ENV
           echo "CMAKE_BUILD_DIR=${BUILD_ROOT}/builddir" >> $GITHUB_ENV
+          echo "INSTALL_QT_VERSION=6.6.0" >> $GITHUB_ENV
 
       - name: 🐩 Install CMake and Ninja
         uses: lukka/get-cmake@latest
@@ -44,7 +45,7 @@ jobs:
       - name: 💐 Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.6.0
+          version: ${{ env.INSTALL_QT_VERSION }}
           modules: 'qt5compat qtcharts qtpositioning qtserialport qtconnectivity qtimageformats qtmultimedia qtwebview qtsensors'
           target: desktop
 
@@ -93,7 +94,7 @@ jobs:
 
       - name: Package
         run: |
-          rm /home/runner/work/QField/Qt/6.6.0/gcc_64/plugins/sqldrivers/libqsqlmimer.so
+          rm /home/runner/work/QField/Qt/${{ env.INSTALL_QT_VERSION }}/gcc_64/plugins/sqldrivers/libqsqlmimer.so
           export LD_LIBRARY_PATH="${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed/x64-linux/lib/":${LD_LIBRARY_PATH}
           cmake --build  "${{ env.CMAKE_BUILD_DIR }}" --target bundle --config ${{ env.BUILD_TYPE }}
           echo "ARTIFACT_PATHNAME=${{ env.CMAKE_BUILD_DIR }}/QField-x86_64.AppImage" >> $GITHUB_ENV