version bumps + debug output++

AlpineMapsOrg · Dec 23, 2024 · 596c335 · 596c335
1 parent a285156
commit 596c335
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -48,9 +48,9 @@ jobs:
       with:
         aqtversion: '==3.1.*'
         version: ${{ matrix.qtversion }}
-        host: linux
+        host: 'linux'
         target: 'desktop'
-        arch: linux_gcc_64
+        arch: 'linux_gcc_64'
         dir: '${{github.workspace}}/qt'
         install-deps: 'true'
         cache: true
@@ -80,7 +80,7 @@ jobs:
       run: |
         echo "${{github.workspace}}/qt/Qt/6.8.1":
         ls ${{github.workspace}}/qt/Qt/6.8.1
-        
+        echo "==="
         echo "${QT_ROOT_DIR}/lib/cmake/Qt6Linguist:"
         ls ${QT_ROOT_DIR}/lib/cmake/Qt6Linguist
         echo "==="

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -48,23 +48,33 @@ jobs:
         sudo apt-get install -y build-essential ninja-build lld clang-15 libgl1-mesa-dev libxcb-cursor-dev xorg-dev libxrandr-dev libxcursor-dev libudev-dev libopenal-dev libflac-dev libvorbis-dev libgl1-mesa-dev libegl1-mesa-dev libdrm-dev libgbm-dev xvfb libxcb-cursor0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         aqtversion: '==3.1.*'
-        version: '6.6.1'
+        version: '6.8.1'
         host: 'linux'
         target: 'desktop'
-        arch: 'gcc_64'
+        arch: 'linux_gcc_64'
         dir: '${{github.workspace}}/qt'
         install-deps: 'true'
         modules: 'qtcharts qtpositioning'
         cache: true
-
+
+    - name: Debug output
+      shell: bash
+      run: |
+        echo "${{github.workspace}}/qt/Qt/6.8.1":
+        ls ${{github.workspace}}/qt/Qt/6.8.1
+        echo "==="
+        echo "${QT_ROOT_DIR}/lib/cmake/Qt6Linguist:"
+        ls ${QT_ROOT_DIR}/lib/cmake/Qt6Linguist
+        echo "==="
+        
     - name: Configure
       env:
         CC: ${{ matrix.CC }}
         CXX: ${{ matrix.CXX }}
-        CMAKE_PREFIX_PATH: ${{env.Qt6_Dir}}/lib/cmake
+        CMAKE_PREFIX_PATH: ${{env.QT_ROOT_DIR}}/lib/cmake
       run: >
         cmake -G Ninja 
         -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -40,10 +40,10 @@ jobs:
           mklink libglapi.dll "x64\libglapi.dll"
     
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         aqtversion: '==3.1.*'
-        version: '6.6.1'
+        version: '6.8.1'
         host: windows
         target: 'desktop'
         arch: 'win64_msvc2019_64'
@@ -54,7 +54,7 @@ jobs:
 
     - name: Configure
       env:
-        CMAKE_PREFIX_PATH: ${{env.Qt6_Dir}}/lib/cmake
+        CMAKE_PREFIX_PATH: ${{env.QT_ROOT_DIR}}/lib/cmake
       run: >
         cmake -G Ninja
         -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}