ci: use Qt install action for windows
This commit is contained in:
parent
d5624ba65e
commit
9f68514577
2 changed files with 15 additions and 7 deletions
16
.github/actions/install-dependencies/action.yml
vendored
16
.github/actions/install-dependencies/action.yml
vendored
|
|
@ -9,8 +9,12 @@ inputs:
|
||||||
description: "Used only on linux distro type: debian, fedora, suse, arch"
|
description: "Used only on linux distro type: debian, fedora, suse, arch"
|
||||||
required: false
|
required: false
|
||||||
|
|
||||||
mac-qt-version:
|
qt-version:
|
||||||
description: "The verison of Qt to install on mac os"
|
description: "The version of Qt to install (Windows & macOS)"
|
||||||
|
required: false
|
||||||
|
|
||||||
|
qt-install-dir:
|
||||||
|
description: "The path to install Qt into (Windows & macOS)"
|
||||||
required: false
|
required: false
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
|
@ -67,13 +71,13 @@ runs:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
if: ${{runner.os == 'macOS' }}
|
if: ${{runner.os != 'Linux' }}
|
||||||
uses: jurplel/install-qt-action@v4
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
dir: "/Users/runner"
|
dir: ${{inputs.qt-install-dir}}
|
||||||
version: ${{inputs.mac-qt-version}}
|
version: ${{inputs.qt-version}}
|
||||||
cache: true
|
cache: true
|
||||||
cache-key-prefix: ${{matrix.target.os}}-${{env.qt-version}}
|
cache-key-prefix: ${{matrix.target.os}}-${{inputs.qt-version}}
|
||||||
|
|
||||||
# Install Ninja with an action instead of using Chocolatey, as it's more
|
# Install Ninja with an action instead of using Chocolatey, as it's more
|
||||||
# reliable and faster. The Ninja install action is pretty good as it
|
# reliable and faster. The Ninja install action is pretty good as it
|
||||||
|
|
|
||||||
6
.github/workflows/continuous-integration.yml
vendored
6
.github/workflows/continuous-integration.yml
vendored
|
|
@ -133,17 +133,20 @@ jobs:
|
||||||
runs-on: "windows-2022"
|
runs-on: "windows-2022"
|
||||||
timeout: 120 #Windows can take while if it has to build vcpkg cache
|
timeout: 120 #Windows can take while if it has to build vcpkg cache
|
||||||
config-args: "-G Ninja"
|
config-args: "-G Ninja"
|
||||||
|
qt-install-dir: "C:"
|
||||||
|
|
||||||
- name: "macos-14-arm64"
|
- name: "macos-14-arm64"
|
||||||
runs-on: "macos-14"
|
runs-on: "macos-14"
|
||||||
timeout: 10
|
timeout: 10
|
||||||
arch: arm64
|
arch: arm64
|
||||||
config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
|
config-args: "-DCMAKE_OSX_ARCHITECTURES=\"arm64\""
|
||||||
|
qt-install-dir: "/Users/runner"
|
||||||
|
|
||||||
- name: "macos-13-x64"
|
- name: "macos-13-x64"
|
||||||
runs-on: macos-13
|
runs-on: macos-13
|
||||||
timeout: 20
|
timeout: 20
|
||||||
config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
|
config-args: "-DCMAKE_OSX_ARCHITECTURES=\"x86_64\""
|
||||||
|
qt-install-dir: "/Users/runner"
|
||||||
|
|
||||||
- name: "debian-13-x86_64"
|
- name: "debian-13-x86_64"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -255,7 +258,8 @@ jobs:
|
||||||
id: get-deps
|
id: get-deps
|
||||||
uses: ./.github/actions/install-dependencies
|
uses: ./.github/actions/install-dependencies
|
||||||
with:
|
with:
|
||||||
mac-qt-version: 6.8.2
|
qt-version: 6.8.2
|
||||||
|
qt-install-dir: ${{matrix.target.qt-install-dir}}
|
||||||
like: ${{ matrix.target.like }}
|
like: ${{ matrix.target.like }}
|
||||||
|
|
||||||
- name: Get version
|
- name: Get version
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue