Skip to content

Commit 30cb387

Browse files
authored
CI: Qt6 (#12) - zig v0.13.0/v0.14.0 compat
* ci: macos-qt6 * ci: msys2 disable clang32
1 parent ca91d97 commit 30cb387

3 files changed

Lines changed: 27 additions & 15 deletions

File tree

.github/workflows/Linux.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Linux
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
48

59
jobs:
610
build:

.github/workflows/MSYS.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: MSYS2 (MingW)
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
48

59
jobs:
610
build:
@@ -10,7 +14,7 @@ jobs:
1014
matrix:
1115
include: [
1216
{ msystem: CLANG64, arch: x86_64, prefix: /clang64 },
13-
{ msystem: CLANG32, arch: i686, prefix: /clang32 }
17+
# { msystem: CLANG32, arch: i686, prefix: /clang32 }
1418
]
1519

1620
steps:
@@ -25,20 +29,20 @@ jobs:
2529
with:
2630
msystem: ${{ matrix.msystem }}
2731
path-type: inherit
28-
install: git base-devel binutils unzip mingw-w64-clang-${{ matrix.arch }}-toolchain mingw-w64-clang-${{ matrix.arch }}-cmake mingw-w64-clang-${{ matrix.arch }}-qt5-base mingw-w64-clang-${{ matrix.arch }}-qt5-declarative
32+
install: git base-devel binutils unzip mingw-w64-clang-${{ matrix.arch }}-toolchain mingw-w64-clang-${{ matrix.arch }}-cmake mingw-w64-clang-${{ matrix.arch }}-qt6-base mingw-w64-clang-${{ matrix.arch }}-qt6-declarative
2933
update: true
3034

3135
- name: Move Checkout
3236
run: |
3337
Copy-Item -Path ".\temp" -Destination "C:\_" -Recurse
3438
35-
- name: Build & Tests (x86)
36-
shell: msys2 {0}
37-
if: ${{ matrix.arch == 'i686' }}
38-
run: |
39-
cd /C/_
40-
zig build cmake
41-
zig build -Dtarget=x86-windows --summary all -freference-trace
39+
# - name: Build & Tests (x86)
40+
# shell: msys2 {0}
41+
# if: ${{ matrix.arch == 'i686' }}
42+
# run: |
43+
# cd /C/_
44+
# zig build cmake
45+
# zig build -Dtarget=x86-windows --summary all -freference-trace
4246

4347
- name: Build & Tests (x86_x64)
4448
shell: msys2 {0}

.github/workflows/MacOS.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: MacOS
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
48

59
jobs:
610
build:
@@ -13,14 +17,14 @@ jobs:
1317
- uses: mlugg/setup-zig@v1
1418
- name: Install
1519
run: brew install cmake
16-
- uses: jurplel/install-qt-action@v3
20+
- uses: jurplel/install-qt-action@v4
1721
with:
18-
version: 5.15.2
22+
version: 6.8.2
1923
dir: '${{ github.workspace }}/build/'
2024

2125
- name: Build & Tests
2226
run: |
23-
QTDIR="$GITHUB_WORKSPACE/build/Qt/5.15.2/clang_64" && \
27+
QTDIR="$GITHUB_WORKSPACE/build/Qt/6.8.2/clang_64" && \
2428
PATH="${QTDIR}/bin:$PATH" && LDFLAGS=-L${QTDIR}/lib && \
2529
CPPFLAGS=-I${QTDIR}/include && \
2630
zig build cmake && \

0 commit comments

Comments
 (0)