From 3e4346e3210c2afec776d02be820c613685c4e2d Mon Sep 17 00:00:00 2001 From: DioEgizio <83089242+DioEgizio@users.noreply.github.com> Date: Fri, 15 Jul 2022 09:09:17 +0200 Subject: [PATCH 1/2] feat(actions): bring back qt caching Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com> --- .github/workflows/build.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc92f37f..2685c940 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,7 @@ jobs: qt_host: linux qt_version: '6.3.1' qt_modules: 'qt5compat qtimageformats' + qt_path: /home/runner/work/PolyMC/Qt - os: windows-2022 name: "Windows-Legacy" @@ -45,6 +46,7 @@ jobs: qt_host: mac qt_version: '6.3.1' qt_modules: 'qt5compat qtimageformats' + qt_path: /Users/runner/work/PolyMC/Qt runs-on: ${{ matrix.os }} @@ -138,7 +140,15 @@ jobs: - name: Install Qt (Linux) if: runner.os == 'Linux' && matrix.appimage != true run: | - sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 + sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 + + - name: Cache Qt (macOS and AppImage) + id: cache-qt + if: matrix.qt_ver == 6 && runner.os != 'Windows' + uses: actions/cache@v3 + with: + path: '${{ matrix.qt_path }}/${{ matrix.qt_version }}' + key: ${{ matrix.qt_host }}-${{ matrix.qt_version }}-"${{ matrix.qt_modules }}"-qt_cache - name: Install Qt (macOS and AppImage) if: matrix.qt_ver == 6 && runner.os != 'Windows' @@ -148,6 +158,7 @@ jobs: host: ${{ matrix.qt_host }} target: 'desktop' modules: ${{ matrix.qt_modules }} + cached: ${{ steps.cache-qt.outputs.cache-hit }} aqtversion: ==2.1.* - name: Prepare AppImage (Linux) From 6732b77594f67906de556448b0b941a25b2aa73d Mon Sep 17 00:00:00 2001 From: txtsd Date: Fri, 15 Jul 2022 22:40:12 +0530 Subject: [PATCH 2/2] chore(actions): Remove superfluous whitespace Signed-off-by: txtsd --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2685c940..1108fed6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: if: runner.os == 'Linux' && matrix.appimage != true run: | sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5core5a libqt5network5 libqt5gui5 - + - name: Cache Qt (macOS and AppImage) id: cache-qt if: matrix.qt_ver == 6 && runner.os != 'Windows'