Skip to content

Commit 704fd33

Browse files
committed
Fix WIN CI
1 parent b5a1a5d commit 704fd33

File tree

1 file changed

+35
-14
lines changed

1 file changed

+35
-14
lines changed

.github/workflows/installer.yml

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Installer
22

33
on:
44
push:
5-
branches: [ "master", "qe3" ]
5+
branches: [ "master", "qe3", "qe3-win-ci" ]
66
pull_request:
77
branches: [ "master", "qe3" ]
88

@@ -16,19 +16,40 @@ jobs:
1616
with:
1717
submodules: true
1818

19-
# - name: Cache libraries
20-
# id: cache-libs
21-
# uses: actions/cache@v3
22-
# with:
23-
# path: |
24-
# C:/openssl/bin/libssl-1_1-x64.dll
25-
# C:/openssl/bin/libcrypto-1_1-x64.dll
26-
# C:/Program Files/PostgreSQL/14/bin/libiconv-2.dll
27-
# C:/Program Files/PostgreSQL/14/bin/libintl-9.dll
28-
# C:/Program Files/PostgreSQL/14/bin/liblz4.dll
29-
# C:/Program Files/PostgreSQL/14/bin/zlib1.dll
30-
# C:/Program Files/PostgreSQL/14/bin/libpq.dll
31-
# key: ${{ runner.os }}-library-cache
19+
# - name: Cache libraries
20+
# id: cache-libs
21+
# uses: actions/cache@v3
22+
# with:
23+
# path: |
24+
# C:/openssl/bin/libssl-1_1-x64.dll
25+
# C:/openssl/bin/libcrypto-1_1-x64.dll
26+
# C:/Program Files/PostgreSQL/14/bin/libiconv-2.dll
27+
# C:/Program Files/PostgreSQL/14/bin/libintl-9.dll
28+
# C:/Program Files/PostgreSQL/14/bin/liblz4.dll
29+
# C:/Program Files/PostgreSQL/14/bin/zlib1.dll
30+
# C:/Program Files/PostgreSQL/14/bin/libpq.dll
31+
# key: ${{ runner.os }}-library-cache
32+
33+
- name: Setup MinGW cache
34+
uses: actions/cache@v4
35+
with:
36+
key: x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1.7z
37+
path: ${{github.workspace}}/x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1.7z
38+
39+
- name: Install MinGW
40+
# WinMain apps fail to link with the default MinGW compiler on GH actions. I suspect it is because Qt (since
41+
# 6.8) uses msvcrt, but GH Actions uses the ucrt version. Furthermore, GH Actions might have an older MinGW
42+
# version which might make things even less compatible. I don't know the exact reasoning. This works, and that's
43+
# all that matters for me.
44+
run: |
45+
MINGW_FILE_NAME='x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1.7z'
46+
if ! [[ -f '${{github.workspace}}'/"$MINGW_FILE_NAME" ]]; then
47+
curl -L "https://github.com/niXman/mingw-builds-binaries/releases/download/13.1.0-rt_v11-rev1/$MINGW_FILE_NAME" -o '${{github.workspace}}'/"$MINGW_FILE_NAME"
48+
fi
49+
7z x '${{github.workspace}}'/"$MINGW_FILE_NAME"
50+
echo 'CC=${{github.workspace}}/mingw64/bin/gcc.exe' >> "$GITHUB_ENV"
51+
echo 'CXX=${{github.workspace}}/mingw64/bin/g++.exe' >> "$GITHUB_ENV"
52+
shell: bash
3253

3354
- name: Get libraries
3455
# if: steps.cache-libs.outputs.cache-hit != 'true'

0 commit comments

Comments
 (0)