diff options
| author | Saturneric <[email protected]> | 2023-02-25 10:25:32 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2023-02-25 10:30:32 +0000 |
| commit | bd1eb046a106c20221b73ba0faf0b9cdef862114 (patch) | |
| tree | 78e78450893e98b8828cc41010e377c1561e5f34 | |
| parent | fix: solve codacy issues (diff) | |
| download | GpgFrontend-bd1eb046a106c20221b73ba0faf0b9cdef862114.tar.gz GpgFrontend-bd1eb046a106c20221b73ba0faf0b9cdef862114.zip | |
feat: use aqt to install qt in ci build
1. support for macos and linux
2. remove macos 10.15 totally
| -rw-r--r-- | .github/workflows/debug.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 19 |
2 files changed, 25 insertions, 11 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 610843e4..055347f0 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -23,7 +23,7 @@ jobs: build: strategy: matrix: - os: [ 'ubuntu-latest', 'macos-10.15', 'macos-11', 'macos-12', 'windows-latest' ] + os: [ 'ubuntu-latest', 'macos-11', 'macos-12', 'windows-latest' ] runs-on: ${{ matrix.os }} continue-on-error: true steps: @@ -32,7 +32,7 @@ jobs: run: | git config --global core.autocrlf false git config --global core.eol lf - if: matrix.os == 'windows-latest' || matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12' + if: matrix.os == 'windows-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - uses: actions/checkout@v2 with: @@ -53,12 +53,11 @@ jobs: - name: Install Dependence (macOS) run: | - brew install cmake autoconf automake qt texinfo gettext [email protected] + brew install cmake autoconf automake texinfo gettext [email protected] brew install boost ninja libarchive libconfig gpgme brew unlink gettext && brew link --force gettext - brew link qt brew link [email protected] --force - if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12' + if: matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Build gpg-error (Linux) run: | @@ -93,7 +92,7 @@ jobs: with: path: ../Qt key: ${{ runner.os }}-qt-cache-6 - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -101,7 +100,7 @@ jobs: version: '6.4.2' modules: 'qt5compat' cached: ${{ steps.cache-qt.outputs.cache-hit }} - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Set up MinGW (Windows) uses: msys2/setup-msys2@v2 @@ -132,7 +131,7 @@ jobs: run: | cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DGPGFRONTEND_BUILD_TYPE_TEST_UI=ON cmake --build ${{github.workspace}}/build --config {{$env.BUILD_TYPE}} -- -v - if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12' + if: matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Configure CMake & Build Binary(Windows) shell: msys2 {0} @@ -160,7 +159,7 @@ jobs: with: name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{steps.vars.outputs.sha_short}} path: ${{github.workspace}}/build/release/* - if: matrix.os == 'macos-10.15' || matrix.os == 'macos-11' || matrix.os == 'macos-12' + if: matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Upload Artifact(Windows) uses: actions/upload-artifact@master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 230ab7c4..d10dde2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,12 +94,27 @@ jobs: cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles if: matrix.os == 'macos-11' || matrix.os == 'macos-12' + - name: Cache Qt (macOS) + id: cache-qt-6 + uses: actions/cache@v1 + with: + path: ../Qt + key: ${{ runner.os }}-qt-cache-6 + if: matrix.os == 'macos-11' || matrix.os == 'macos-12' + + - name: Install Qt6 (macOS) + uses: jurplel/install-qt-action@v3 + with: + version: '6.4.2' + modules: 'qt5compat' + cached: ${{ steps.cache-qt.outputs.cache-hit }} + if: matrix.os == 'macos-11' || matrix.os == 'macos-12' + - name: Install Dependence (macOS) run: | - brew install cmake autoconf automake qt texinfo gettext [email protected] + brew install cmake autoconf automake texinfo gettext [email protected] brew install boost ninja libarchive libconfig gpgme brew unlink gettext && brew link --force gettext - brew link qt brew link [email protected] --force if: matrix.os == 'macos-11' || matrix.os == 'macos-12' |