From d4b7655d503ef97ca6e390ebaf56fc28b762d05e Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Wed, 27 Dec 2023 07:06:02 -0500 Subject: [PATCH] Use workflow environment to set Qt version --- .github/workflows/all-builds.yml | 33 +++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml index 1bd542a..fbc3abe 100644 --- a/.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -5,6 +5,9 @@ on: pull_request: workflow_dispatch: +env: + QT_VERSION: 6.6.0 + jobs: Qtk: env: @@ -15,13 +18,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -31,7 +34,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.6.0' + version: ${{ env.QT_VERSION }} # Windows @@ -145,13 +148,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -161,7 +164,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.6.0' + version: ${{ env.QT_VERSION }} # Windows @@ -250,13 +253,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -266,7 +269,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.6.0' + version: ${{ env.QT_VERSION }} - name: Chocolatey Action if: matrix.os == 'windows-latest' @@ -295,9 +298,9 @@ jobs: os: [ubuntu-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ runs-on: ${{ matrix.os }} steps: @@ -306,7 +309,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.6.0' + version: ${{ env.QT_VERSION }} - name: Install Assimp MacOS if: matrix.os == 'macos-latest'