Skip to content

Commit

Permalink
Update and try to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Abestanis committed Oct 8, 2024
1 parent 457a97b commit 904ef4c
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 40 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: cpp, python
- name: Install Qt ${{ matrix.qt_version }}
uses: jurplel/install-qt-action@v3
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: 5.14.1
version: 6.8.0
cache: true
dir: ${{ runner.temp }}/Qt
- name: Install additional dependencies
shell: bash
run: |
sudo apt-get update -qq;
sudo apt install -qq libx11-dev libqt5svg5-dev libx11-xcb-dev
sudo apt install -qq libx11-dev qt6-qtsvg-dev
- name: Create build environment
run: cmake -E make_directory ${{ runner.workspace }}/build
- name: Configure CMake
Expand Down
45 changes: 12 additions & 33 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,48 +9,32 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
arch: [x86, x64]
qt_version: [5.9.9, 5.15.2]
qt_version: [6.0.4, 6.8.0]
include:
- os: windows-latest
arch: x86
qt_compile_suite: win32_msvc2019
- os: windows-latest
arch: x64
qt_compile_suite: win64_msvc2019_64
qt_compile_suite: msvc2022_64
exclude:
# We only want to test for the latest version of Qt on Windows
- os: windows-latest
qt_version: 5.9.9
# We only compile for the current architecture of the runner for Linux
- os: ubuntu-latest
arch: x86
qt_version: 6.8.0
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install Qt ${{ matrix.qt_version }}
uses: jurplel/install-qt-action@v3
uses: jurplel/install-qt-action@v4
with:
version: ${{ matrix.qt_version }}
arch: ${{ matrix.qt_compile_suite }}
cache: true
dir: ${{ runner.temp }}/Qt
- name: Install additional dependencies
shell: bash
env:
ARCH: ${{ matrix.arch }}
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get update -qq;
sudo apt install -qq libx11-dev libqt5svg5-dev libx11-xcb-dev desktop-file-utils
elif [ "$RUNNER_OS" == "Windows" ]; then
if [ "$ARCH" == "x86" ]; then
echo "CMAKE_PLATFORM_ARG=-A Win32" >> $GITHUB_ENV
export archParam="--forcex86"
else
echo "CMAKE_PLATFORM_ARG=-A x64" >> $GITHUB_ENV
fi
choco install -y --force $archParam openssl.light --version=1.1.1
choco install -y --force openssl.light --version=1.1.1
echo "C:\\Program Files\\OpenSSL" >> $GITHUB_PATH
else
echo "$RUNNER_OS not supported"
Expand All @@ -61,7 +45,7 @@ jobs:
- name: Configure CMake
shell: bash
working-directory: ${{ runner.workspace }}/build
run: cmake $GITHUB_WORKSPACE $CMAKE_PLATFORM_ARG -DCMAKE_BUILD_TYPE=Release -DCOMPILER_WARNINGS_AS_ERRORS=ON -DBUILD_WITH_TESTS=ON -DDONT_EXECUTE_INSTALLER=ON
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Release -DCOMPILER_WARNINGS_AS_ERRORS=ON -DBUILD_WITH_TESTS=ON -DDONT_EXECUTE_INSTALLER=ON
- name: Register build problem matchers
run: |
echo "::add-matcher::.github/problem-matchers/linguist.json"
Expand Down Expand Up @@ -116,10 +100,10 @@ jobs:
mkdir installer/cache
mv installer/$installerFile installer/cache
- name: Cache installer
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: steps.check-deploy.outputs.is_deploy == 'true'
with:
name: installer-${{ runner.os }}-${{ matrix.arch }}-${{ github.sha }}
name: installer-${{ runner.os }}-${{ github.sha }}
path: installer/cache/${{ steps.find_installer_file.outputs.installer_file }}

release:
Expand All @@ -129,7 +113,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Check if this is a deployment build
id: deploy_check
shell: bash
Expand All @@ -141,16 +125,11 @@ jobs:
echo "Tag does not match: ${{ github.event.ref }}"
exit 1
fi
- name: Download installer (x86)
uses: actions/[email protected]
with:
name: installer-Windows-x86-${{ github.sha }}
path: installer-x86
- name: Download installer (x64)
uses: actions/download-artifact@v4.1.7
uses: actions/download-artifact@v4
with:
name: installer-Windows-x64-${{ github.sha }}
path: installer-x64
path: installer
- name: Create Release
uses: ncipollo/release-action@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python 3.x
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Check translation filenames
Expand Down

0 comments on commit 904ef4c

Please sign in to comment.