diff options
| author | Saturneric <[email protected]> | 2023-04-04 18:55:51 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2023-04-04 18:55:51 +0000 |
| commit | c9c27e33a1b2dca8aee4a00f0036f43e785affc1 (patch) | |
| tree | 292fe495cfc31c6b4b05389454f6a1ec72f19893 | |
| parent | fix: use libgcrypt20-dev in ubuntu build (diff) | |
| download | GpgFrontend-c9c27e33a1b2dca8aee4a00f0036f43e785affc1.tar.gz GpgFrontend-c9c27e33a1b2dca8aee4a00f0036f43e785affc1.zip | |
feat: use gcc-11 on ubuntu 20.04 and add qt cache
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/debug.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 18 |
3 files changed, 9 insertions, 26 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f76977ed..9703a976 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -91,17 +91,11 @@ jobs: sudo make install cd ${{github.workspace}} - - name: Cache Qt - id: cache-qt-6 - uses: actions/cache@v3 - with: - path: ../Qt - key: ${{ runner.os }}-qt-cache-6 - - name: Install Qt uses: jurplel/install-qt-action@v3 with: version: '6.4.2' + cache: 'true' modules: 'qt5compat' cached: ${{ steps.cache-qt.outputs.cache-hit }} diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 3c21026f..db566fdb 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -87,18 +87,11 @@ jobs: cd ${{github.workspace}} if: matrix.os == 'ubuntu-latest' - - name: Cache Qt - id: cache-qt - uses: actions/cache@v3 - with: - path: ../Qt - key: ${{ runner.os }}-qt-cache-6 - if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - - name: Install Qt uses: jurplel/install-qt-action@v3 with: version: '6.4.2' + cache: 'true' modules: 'qt5compat' cache: ${{ steps.cache-qt.outputs.cache-hit }} if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8dfdd256..35a5735e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,12 +46,16 @@ jobs: run: | sudo apt-get update sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo - sudo apt-get -y install gcc g++ ninja-build + sudo apt-get -y install gcc-11 g++-11 ninja-build sudo apt-get -y install libconfig++-dev libarchive-dev libssl-dev sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev sudo apt-get -y install libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-image0 sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-* + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11 + sudo update-alternatives --set gcc "/usr/bin/gcc-11" + sudo update-alternatives --set g++ "/usr/bin/g++-11" if: matrix.os == 'ubuntu-20.04' - name: Install Boost (Linux) @@ -91,20 +95,12 @@ 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@v3 - with: - path: ../Qt - key: ${{ runner.os }}-qt-cache-6 - if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - - - name: Install Qt6 (macOS) + - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: version: '6.4.2' modules: 'qt5compat' - cache: ${{ steps.cache-qt.outputs.cache-hit }} + cache: 'true' if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'macos-12' - name: Install Dependence (macOS) |