mirror of
https://github.com/znc/znc.git
synced 2026-08-09 10:23:14 +02:00
Switch integration test to qt6 (#1916)
Keep using Qt5 for Cygwin and CodeQL * CI: upgrade ubuntu
This commit is contained in:
@@ -6,7 +6,7 @@ on:
|
||||
jobs:
|
||||
gcc:
|
||||
name: GCC
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -23,7 +23,7 @@ jobs:
|
||||
|
||||
tarball:
|
||||
name: Tarball
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-24.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -48,7 +48,7 @@ jobs:
|
||||
# can be removed when asan below is fixed
|
||||
clang:
|
||||
name: Clang
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-24.04
|
||||
env:
|
||||
CXX: clang++
|
||||
CC: clang
|
||||
@@ -69,7 +69,7 @@ jobs:
|
||||
|
||||
#clang_asan:
|
||||
#name: Clang ASAN
|
||||
#runs-on: ubuntu-20.04
|
||||
#runs-on: ubuntu-24.04
|
||||
#env:
|
||||
#CXX: clang++
|
||||
#CC: clang
|
||||
@@ -85,7 +85,7 @@ jobs:
|
||||
|
||||
#clang_tsan:
|
||||
#name: Clang TSAN
|
||||
#runs-on: ubuntu-20.04
|
||||
#runs-on: ubuntu-24.04
|
||||
#env:
|
||||
#CXX: clang++
|
||||
#CC: clang
|
||||
@@ -119,7 +119,7 @@ jobs:
|
||||
submodules: true
|
||||
- run: |
|
||||
brew update
|
||||
brew install icu4c qt5 gettext pkg-config cpanminus boost
|
||||
brew install icu4c qt6 gettext pkg-config cpanminus boost argon2 swig
|
||||
- run: source .github/build.sh
|
||||
- uses: codecov/codecov-action@v3
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ name: "CodeQL"
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ 'master', '1.6.x' ]
|
||||
branches: [ 'master', '1.9.x' ]
|
||||
pull_request:
|
||||
# The branches below must be a subset of the branches above
|
||||
branches: [ 'master' ]
|
||||
@@ -12,7 +12,7 @@ on:
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
actions: read
|
||||
contents: read
|
||||
@@ -28,7 +28,10 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: true
|
||||
- run: source .github/ubuntu_deps.sh
|
||||
- run: |
|
||||
source .github/ubuntu_deps.sh
|
||||
sudo apt-get remove -y qt6-base-dev
|
||||
sudo apt-get install -y qtbase5-dev
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v3
|
||||
@@ -36,6 +39,8 @@ jobs:
|
||||
languages: ${{ matrix.language }}
|
||||
|
||||
- run: source .github/build.sh
|
||||
env:
|
||||
ZNC_QT_VER: "5"
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v3
|
||||
|
||||
Reference in New Issue
Block a user