Skip to content

Commit 904ef4c

Browse files
committed
Update and try to fix CI
1 parent 457a97b commit 904ef4c

File tree

3 files changed

+19
-40
lines changed

3 files changed

+19
-40
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Initialize CodeQL
2222
uses: github/codeql-action/init@v2
2323
with:
2424
languages: cpp, python
25-
- name: Install Qt ${{ matrix.qt_version }}
26-
uses: jurplel/install-qt-action@v3
25+
- name: Install Qt
26+
uses: jurplel/install-qt-action@v4
2727
with:
28-
version: 5.14.1
28+
version: 6.8.0
2929
cache: true
3030
dir: ${{ runner.temp }}/Qt
3131
- name: Install additional dependencies
3232
shell: bash
3333
run: |
3434
sudo apt-get update -qq;
35-
sudo apt install -qq libx11-dev libqt5svg5-dev libx11-xcb-dev
35+
sudo apt install -qq libx11-dev qt6-qtsvg-dev
3636
- name: Create build environment
3737
run: cmake -E make_directory ${{ runner.workspace }}/build
3838
- name: Configure CMake

.github/workflows/main.yml

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,32 @@ jobs:
99
strategy:
1010
matrix:
1111
os: [windows-latest, ubuntu-latest]
12-
arch: [x86, x64]
13-
qt_version: [5.9.9, 5.15.2]
12+
qt_version: [6.0.4, 6.8.0]
1413
include:
1514
- os: windows-latest
16-
arch: x86
17-
qt_compile_suite: win32_msvc2019
18-
- os: windows-latest
19-
arch: x64
20-
qt_compile_suite: win64_msvc2019_64
15+
qt_compile_suite: msvc2022_64
2116
exclude:
2217
# We only want to test for the latest version of Qt on Windows
2318
- os: windows-latest
24-
qt_version: 5.9.9
25-
# We only compile for the current architecture of the runner for Linux
26-
- os: ubuntu-latest
27-
arch: x86
19+
qt_version: 6.8.0
2820
steps:
2921
- name: Checkout repository
30-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
3123
- name: Install Qt ${{ matrix.qt_version }}
32-
uses: jurplel/install-qt-action@v3
24+
uses: jurplel/install-qt-action@v4
3325
with:
3426
version: ${{ matrix.qt_version }}
3527
arch: ${{ matrix.qt_compile_suite }}
3628
cache: true
3729
dir: ${{ runner.temp }}/Qt
3830
- name: Install additional dependencies
3931
shell: bash
40-
env:
41-
ARCH: ${{ matrix.arch }}
4232
run: |
4333
if [ "$RUNNER_OS" == "Linux" ]; then
4434
sudo apt-get update -qq;
4535
sudo apt install -qq libx11-dev libqt5svg5-dev libx11-xcb-dev desktop-file-utils
4636
elif [ "$RUNNER_OS" == "Windows" ]; then
47-
if [ "$ARCH" == "x86" ]; then
48-
echo "CMAKE_PLATFORM_ARG=-A Win32" >> $GITHUB_ENV
49-
export archParam="--forcex86"
50-
else
51-
echo "CMAKE_PLATFORM_ARG=-A x64" >> $GITHUB_ENV
52-
fi
53-
choco install -y --force $archParam openssl.light --version=1.1.1
37+
choco install -y --force openssl.light --version=1.1.1
5438
echo "C:\\Program Files\\OpenSSL" >> $GITHUB_PATH
5539
else
5640
echo "$RUNNER_OS not supported"
@@ -61,7 +45,7 @@ jobs:
6145
- name: Configure CMake
6246
shell: bash
6347
working-directory: ${{ runner.workspace }}/build
64-
run: cmake $GITHUB_WORKSPACE $CMAKE_PLATFORM_ARG -DCMAKE_BUILD_TYPE=Release -DCOMPILER_WARNINGS_AS_ERRORS=ON -DBUILD_WITH_TESTS=ON -DDONT_EXECUTE_INSTALLER=ON
48+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCOMPILER_WARNINGS_AS_ERRORS=ON -DBUILD_WITH_TESTS=ON -DDONT_EXECUTE_INSTALLER=ON
6549
- name: Register build problem matchers
6650
run: |
6751
echo "::add-matcher::.github/problem-matchers/linguist.json"
@@ -116,10 +100,10 @@ jobs:
116100
mkdir installer/cache
117101
mv installer/$installerFile installer/cache
118102
- name: Cache installer
119-
uses: actions/upload-artifact@v3
103+
uses: actions/upload-artifact@v4
120104
if: steps.check-deploy.outputs.is_deploy == 'true'
121105
with:
122-
name: installer-${{ runner.os }}-${{ matrix.arch }}-${{ github.sha }}
106+
name: installer-${{ runner.os }}-${{ github.sha }}
123107
path: installer/cache/${{ steps.find_installer_file.outputs.installer_file }}
124108

125109
release:
@@ -129,7 +113,7 @@ jobs:
129113
runs-on: ubuntu-latest
130114
steps:
131115
- name: Checkout repository
132-
uses: actions/checkout@v3
116+
uses: actions/checkout@v4
133117
- name: Check if this is a deployment build
134118
id: deploy_check
135119
shell: bash
@@ -141,16 +125,11 @@ jobs:
141125
echo "Tag does not match: ${{ github.event.ref }}"
142126
exit 1
143127
fi
144-
- name: Download installer (x86)
145-
uses: actions/download-artifact@v4.1.7
146-
with:
147-
name: installer-Windows-x86-${{ github.sha }}
148-
path: installer-x86
149128
- name: Download installer (x64)
150-
uses: actions/download-artifact@v4.1.7
129+
uses: actions/download-artifact@v4
151130
with:
152131
name: installer-Windows-x64-${{ github.sha }}
153-
path: installer-x64
132+
path: installer
154133
- name: Create Release
155134
uses: ncipollo/release-action@v1
156135
with:

.github/workflows/translations.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
check:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- name: Set up Python 3.x
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: '3.x'
2020
- name: Check translation filenames

0 commit comments

Comments
 (0)