Merge branch 'fix/sonar-cmake' into staged

This commit is contained in:
xiaoyifang 2022-12-14 17:54:18 +08:00
commit dc096862e9

View file

@ -11,7 +11,7 @@ on:
# types: [opened, synchronize, reopened] # types: [opened, synchronize, reopened]
jobs: jobs:
job1: job1:
name: Build and analyze name: ubuntu Build and analyze
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/setup-python@v3 - uses: actions/setup-python@v3
@ -53,7 +53,7 @@ jobs:
cmake --build . cmake --build .
job2: job2:
name: Build and analyze name: windows Build and analyze
runs-on: windows-2019 runs-on: windows-2019
steps: steps:
- uses: actions/setup-python@v3 - uses: actions/setup-python@v3
@ -63,7 +63,7 @@ jobs:
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: 6.3.2 version: 6.3.2
arch: gcc_64 arch: win64_msvc2019_64
cached: 'false' cached: 'false'
#serialport linuxdeploy need serialport to work. #serialport linuxdeploy need serialport to work.
modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport
@ -76,10 +76,10 @@ jobs:
- name: Run build-wrapper - name: Run build-wrapper
run: | run: |
cmake . cmake . -DCMAKE_BUILD_TYPE=Release
cmake --build . cmake --build .
job3: job3:
name: Build and analyze name: macos Build and analyze
runs-on: macos-12 runs-on: macos-12
steps: steps:
- uses: actions/setup-python@v3 - uses: actions/setup-python@v3
@ -89,7 +89,7 @@ jobs:
uses: jurplel/install-qt-action@v3 uses: jurplel/install-qt-action@v3
with: with:
version: 6.3.2 version: 6.3.2
arch: gcc_64 arch: clang_64
cached: 'false' cached: 'false'
#serialport linuxdeploy need serialport to work. #serialport linuxdeploy need serialport to work.
modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport
@ -101,8 +101,28 @@ jobs:
submodules: true submodules: true
- name: install dependencies - name: install dependencies
run: | run: |
brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true brew install pcre2 harfbuzz freetype
brew install create-dmg brew install cmake ninja python
brew install automake
brew install autoconf
brew install libtool
brew install opencc
brew install ffmpeg@5
#brew reinstall $(brew deps ffmpeg) ffmpeg
brew install libao
brew install libiconv
brew install lzo bzip2
brew install libogg
brew install zstd lzip
brew install libtiff
brew install libvorbis --force
brew install hunspell
wget ftp://ftp.sra.co.jp/pub/misc/eb/eb-4.4.3.tar.bz2
tar xvjf eb-4.4.3.tar.bz2
cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
#brew install qt # or use official offline installer
brew install xz lzo
brew install pkg-config
- name: Run build-wrapper - name: Run build-wrapper
run: | run: |
cmake . cmake .