Skip to content

Commit

Permalink
CI: widown2022
Browse files Browse the repository at this point in the history
  • Loading branch information
dxli committed May 4, 2024
1 parent 97aea57 commit 2d2e2da
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
- name: Install Clang
run: |
sudo apt-get -qq install clang-15 clang-tools-15
sudo apt-get -qq install clang-17 clang-tools-17
- name: Build and analyze
run: |
export CC=g++
export ANALYZE="scan-build-15 -o out --use-cc=g++ --use-analyzer=/usr/bin/clang++ "
export ANALYZE="scan-build-17 -o out --use-cc=g++ --use-analyzer=/usr/bin/clang++ "
${ANALYZE}qmake6 -r librecad.pro CONFIG+=debug_and_release PREFIX=/usr
${ANALYZE}make release -j$(nproc)
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CodeQL"

on:
push:
branches: [ 'master', '2.2' ]
branches: [ 'master', '2.2.1' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'master' ]
Expand All @@ -13,9 +13,7 @@ jobs:
analyze:
name: Analyze

runs-on: ubuntu-22.04
env:
platform_version: 22.04
runs-on: ubuntu-latest

permissions:
actions: read
Expand All @@ -40,13 +38,13 @@ jobs:
- name: Install Qt and dependencies
run: |
sudo apt-get -y update
sudo apt-get -qq install qtbase5-dev libqt5svg5-dev qt5-qmake qtbase5-dev-tools qttools5-dev-tools qtchooser libgl-dev libmuparser-dev libboost-dev librsvg2-bin libfreetype6-dev libicu-dev pkg-config libfuse2
sudo apt-get -qq install qt6-base-dev qt6-base-dev-tools qt6-declarative-dev qmake6 qtchooser libgl-dev libmuparser-dev libboost-dev librsvg2-bin libfreetype6-dev libicu-dev pkg-config libfuse2
sudo ln -snf /usr/lib/x86_64-linux-gnu/qtchooser/qt5.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf
sudo rm -rf /usr/local/lib/android
- name: Install Clang
run: |
sudo apt-get -qq install clang-15 clang-tools-15
sudo apt-get -qq install clang-17 clang-tools-17
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down

0 comments on commit 2d2e2da

Please sign in to comment.