Revert to an output rather than env for cmake path setup

Author: oskirby

.github/actions/qt-setup-taskcluster/action.yml

@@ -11,19 +11,15 @@ inputs:
     description: 'Cache Qt toolchain artifacts'
     required: false
     default: ${{ runner.os == 'Windows' }}
-  cmake-env:
-    description: 'Add cmake environment variables'
-    required: false
-    default: true
+
+outputs:
+  path:
+    description: 'Qt toolchain installation path'
+    value: ${{ steps.resolve.outputs.toolchain-path }}
 
 runs:
   using: "composite"
   steps:
-    - name: Set destination path
-      id: set-dest
-      shell: bash
-      run: echo "path=${GITHUB_WORKSPACE}/3rdparty" >> $GITHUB_OUTPUT
-
     - name: Resolve artifact task
       id: resolve
       shell: bash
@@ -45,21 +41,22 @@ runs:
         # contents. Lucky for us, tar is a streamable format so this kinda works
         # even though the archive is truncated.
         curl -sSL -r0-4096 "https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/${TASKID}/artifacts/${NAME}" -o qt-toolchain-head.tar.xz
-        echo "toolchain-path=$(xzcat qt-toolchain-head.tar.xz 2>/dev/null | tar t 2>/dev/null | head -1 | grep -o '^[^/]*')" >> $GITHUB_OUTPUT
+        TARBALL_PATH=$((xzcat qt-toolchain-head.tar.xz | tar t | head -1 | grep -o '^[^/]*') 2>/dev/null || true)
+        echo "toolchain-path=${GITHUB_WORKSPACE}/3rdparty/${TARBALL_PATH}" >> $GITHUB_OUTPUT
 
     - name: Cache Qt toolchain
       uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
       id: qt-toolchain-cache
       if: ${{ inputs.cache == 'true' }}
       with:
-        path: ${{ steps.set-dest.outputs.path }}/${{ steps.resolve.outputs.toolchain-path }}
+        path: ${{ steps.resolve.outputs.toolchain-path }}
         key: qt-toolchain-${{ steps.resolve.outputs.taskid }}
         enableCrossOsArchive: true
 
     - name: Install Qt toolchain
       if: ${{ inputs.cache != 'true' || steps.qt-toolchain-cache.outputs.cache-hit != 'true' }}
       id: qt-toolchain-install
-      working-directory: ${{ steps.set-dest.outputs.path }}
+      working-directory: ${GITHUB_WORKSPACE}/3rdparty/
       shell: bash
       env:
         QT6_TOOLCHAIN_URL: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/${{ steps.resolve.outputs.taskid }}/artifacts/${{ steps.resolve.outputs.filename }}
@@ -68,18 +65,10 @@ runs:
         curl -sSL "${QT6_TOOLCHAIN_URL}" -o ${FILENAME}
         tar -xf ${FILENAME}
 
-    - name: Get CMake prefix path
-      if: ${{ inputs.cmake-env == 'true' }}
-      id: get-cmake-path
-      working-directory: ${{ steps.set-dest.outputs.path }}/${{ steps.resolve.outputs.toolchain-path }}
-      shell: bash
-      run: |
-        echo "CMAKE_PREFIX_PATH=$(pwd)/lib/cmake" >> $GITHUB_ENV
-
     - name: Save Qt toolchain
       uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
       if: ${{ inputs.cache == 'true' && github.event_name == 'push' && steps.qt-toolchain-cache.outputs.cache-hit != 'true'}}
       with:
-        path: ${{ steps.set-dest.outputs.path }}/${{ steps.resolve.outputs.toolchain-path }}
+        path: ${{ steps.resolve.outputs.toolchain-path }}
         key: qt-toolchain-${{ steps.resolve.outputs.taskid }}
         enableCrossOsArchive: true

.github/workflows/linux_tests.yaml

@@ -64,6 +64,8 @@ jobs:
 
       - name: Compile test client
         shell: bash
+        env:
+          CMAKE_PREFIX_PATH: ${{ steps.setup-qt.outputs.path }}/lib/cmake
         run: |
           mkdir -p build-${{ runner.os }}
           cmake -S $(pwd) -B build-${{ runner.os }} -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \

.github/workflows/macos_tests.yaml

@@ -75,16 +75,18 @@ jobs:
       - name: Setup Qt for macOS
         id: setup-qt
         uses: ./.github/actions/qt-setup-taskcluster
+        with:
+          toolchain-alias: qt-macos-6.10
 
       - name: Setup Qt host tools
         uses: ./.github/actions/qt-setup-taskcluster
         with:
           toolchain-alias: qt-tools-6.10
-          cmake-env: false
 
       - name: Compile test client
         env:
           SDKROOT: ${{ steps.set-sdkroot.outputs.SDKROOT }}
+          CMAKE_PREFIX_PATH: ${{ steps.setup-qt.outputs.path }}/lib/cmake
         run: |
           mkdir -p build/cmake
           cmake -S $(pwd) -B build/cmake -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \

.github/workflows/test_unit.yaml

@@ -43,6 +43,8 @@ jobs:
 
       - name: Building tests
         shell: bash
+        env:
+          CMAKE_PREFIX_PATH: ${{ steps.setup-qt.outputs.path }}/lib/cmake
         run: |
           mkdir -p build
           cmake -S $(pwd) -B build -GNinja
@@ -86,6 +88,8 @@ jobs:
         uses: ./.github/actions/qt-setup-taskcluster
 
       - name: Building tests
+        env:
+          CMAKE_PREFIX_PATH: ${{ steps.setup-qt.outputs.path }}/lib/cmake
         run: |
           export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
           mkdir -p build
@@ -151,6 +155,7 @@ jobs:
         env:
           CC: ${{ steps.set-compiler.outputs.CC }}
           CXX: ${{ steps.set-compiler.outputs.CXX }}
+          CMAKE_PREFIX_PATH: ${{ steps.setup-qt-win.outputs.path }}/lib/cmake
         run: |
           mkdir ./build-win