From d1634c2e707a67fd7da8ba1d33029ccc95254b62 Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Wed, 14 Dec 2022 16:07:03 +0800 Subject: [PATCH 1/3] github: cmake build action --- .github/workflows/cmake build test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake build test.yml b/.github/workflows/cmake build test.yml index b7965cb4..bd4861ef 100644 --- a/.github/workflows/cmake build test.yml +++ b/.github/workflows/cmake build test.yml @@ -11,7 +11,7 @@ on: # types: [opened, synchronize, reopened] jobs: job1: - name: Build and analyze + name: ubuntu Build and analyze runs-on: ubuntu-latest steps: - uses: actions/setup-python@v3 @@ -53,7 +53,7 @@ jobs: cmake --build . job2: - name: Build and analyze + name: windows Build and analyze runs-on: windows-2019 steps: - uses: actions/setup-python@v3 @@ -63,7 +63,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: 6.3.2 - arch: gcc_64 + arch: win64_msvc2019_64 cached: 'false' #serialport linuxdeploy need serialport to work. modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport @@ -79,7 +79,7 @@ jobs: cmake . cmake --build . job3: - name: Build and analyze + name: macos Build and analyze runs-on: macos-12 steps: - uses: actions/setup-python@v3 @@ -89,7 +89,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: 6.3.2 - arch: gcc_64 + arch: clang_64 cached: 'false' #serialport linuxdeploy need serialport to work. modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtserialport From 3f7530340cede231d48c5f24f2df9045b9af7a0f Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Wed, 14 Dec 2022 16:21:25 +0800 Subject: [PATCH 2/3] github: cmake build action ,macos dependencies --- .github/workflows/cmake build test.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake build test.yml b/.github/workflows/cmake build test.yml index bd4861ef..cb83c0a1 100644 --- a/.github/workflows/cmake build test.yml +++ b/.github/workflows/cmake build test.yml @@ -101,8 +101,28 @@ jobs: submodules: true - name: install dependencies run: | - brew uninstall opencc hunspell ffmpeg@5 ffmpeg@4 libtiff xz lzo libogg libvorbis zstd || true - brew install create-dmg + brew install pcre2 harfbuzz freetype + 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 run: | cmake . From 1e6b13421fbc52475f6d79283c4794dc83b11652 Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Wed, 14 Dec 2022 16:26:07 +0800 Subject: [PATCH 3/3] github: cmake build action ,windows --- .github/workflows/cmake build test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake build test.yml b/.github/workflows/cmake build test.yml index cb83c0a1..da10e665 100644 --- a/.github/workflows/cmake build test.yml +++ b/.github/workflows/cmake build test.yml @@ -76,7 +76,7 @@ jobs: - name: Run build-wrapper run: | - cmake . + cmake . -DCMAKE_BUILD_TYPE=Release cmake --build . job3: name: macos Build and analyze