diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-08-25 11:01:42 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-08-25 11:01:42 +0200 |
| commit | 1013817edb176a5c65748b7d1e84279ea39d164f (patch) | |
| tree | 7e567f998d7145b1cbf74eca38ddb4dec7662ba3 /.github | |
| parent | d664ad15981d677ea1fc7b4d11ed9be0e4e3deb6 (diff) | |
| parent | b4c7d6078c2eed3d655e8eb074bf1dca6a93f0e0 (diff) | |
Merge 2.1 into master
Change-Id: Id331ef3cc9e7b48470d391c1c3e917bb323e41f7
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04409a79e..6f0e10448 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -676,6 +676,16 @@ jobs: qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } + - { + name: 'Run macOS tests (Xcode-less)', + runner: 'macos-13', + target: 'desktop', + toolchain: 'clang_64', + xcodeVersion: '', + testProfile: 'xcode_13_4_1-macosx-x86_64', + qtVersion: '6.5.0', + script: './scripts/test-qbs.sh', + } steps: - uses: actions/checkout@v1 - name: Download artifact @@ -704,6 +714,7 @@ jobs: version: ${{ matrix.config.qtVersion }} - name: Select Xcode run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.config.xcodeVersion }}.app + if: matrix.config.xcodeVersion != '' - name: Setup Qbs run: | qbs setup-toolchains --detect @@ -711,6 +722,15 @@ jobs: qbs config profiles.qt.baseProfile ${{ matrix.config.testProfile }} qbs config defaultProfile qt qbs config --list + if: matrix.config.xcodeVersion != '' + - name: Setup Qbs (Xcode-less) + run: | + qbs setup-toolchains /usr/bin/clang++ ${{ matrix.config.testProfile }} + qbs setup-qt $(which qmake) qt + qbs config profiles.qt.baseProfile ${{ matrix.config.testProfile }} + qbs config defaultProfile qt + qbs config --list + if: matrix.config.xcodeVersion == '' - name: Run Tests run: | sudo chmod g+w /cores |