Skip to content

Commit

Permalink
Try to fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Abestanis committed Oct 9, 2024
1 parent 904ef4c commit 06d20bd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
shell: bash
run: |
sudo apt-get update -qq;
sudo apt install -qq libx11-dev qt6-qtsvg-dev
sudo apt install -qq libx11-dev libx11-xcb-dev
- name: Create build environment
run: cmake -E make_directory ${{ runner.workspace }}/build
- name: Configure CMake
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
qt_version: [6.0.4, 6.8.0]
qt_version: [6.2.4, 6.8.0]
include:
- os: windows-latest
qt_compile_suite: msvc2022_64
qt_compile_suite: win64_msvc2022_64
exclude:
# We only want to test for the latest version of Qt on Windows
- os: windows-latest
qt_version: 6.8.0
qt_version: 6.2.4
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -32,7 +32,7 @@ jobs:
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
sudo apt install -qq libx11-dev libx11-xcb-dev desktop-file-utils
elif [ "$RUNNER_OS" == "Windows" ]; then
choco install -y --force openssl.light --version=1.1.1
echo "C:\\Program Files\\OpenSSL" >> $GITHUB_PATH
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ if(WIN32)
set(PLATFORM_EXE_SOURCES src/res/birdtray.rc)
set(PLATFORM_HEADERS src/windowtools_win.h src/birdtrayeventfilter.h src/processhandle.h)
else()
find_library(X11 X11)
list(APPEND REQUIRED_MODULES X11)
set(PLATFORM_SOURCES src/windowtools_x11.cpp)
set(PLATFORM_HEADERS src/windowtools_x11.h)
Expand Down

0 comments on commit 06d20bd

Please sign in to comment.