diff options
| author | Aaron Sonin <10217842+byteduck@users.noreply.github.com> | 2023-01-12 20:11:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-12 20:11:46 -0800 |
| commit | b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7 (patch) | |
| tree | 80773415691e538d437bc03c42f73a8abd01f126 /.github | |
| parent | 160dd09fc2788fea17c8e9e332c2877586640971 (diff) | |
| parent | 5e89ba70797df863c7eeae9b147080e7dbdf6d3b (diff) | |
| download | PrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.tar.gz PrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.tar.bz2 PrismLauncher-b2f48eaeb8cd6dbdf9b8bbbf1a163339c88173a7.zip | |
Merge branch 'PrismLauncher:develop' into instance-accounts
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6e179e1..d074863d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: qt_ver: 6 qt_host: windows qt_arch: '' - qt_version: '6.4.0' + qt_version: '6.4.2' qt_modules: 'qt5compat qtimageformats' qt_tools: '' @@ -73,7 +73,7 @@ jobs: qt_ver: 6 qt_host: windows qt_arch: 'win64_msvc2019_arm64' - qt_version: '6.4.0' + qt_version: '6.4.2' qt_modules: 'qt5compat qtimageformats' qt_tools: '' @@ -105,6 +105,7 @@ jobs: INSTALL_APPIMAGE_DIR: "install-appdir" BUILD_DIR: "build" CCACHE_VAR: "" + HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 steps: ## @@ -143,7 +144,7 @@ jobs: - name: Setup ccache if: (runner.os != 'Windows' || matrix.msystem == '') && inputs.build_type == 'Debug' - uses: hendrikmuhs/ccache-action@v1.2.5 + uses: hendrikmuhs/ccache-action@v1.2.6 with: key: ${{ matrix.os }}-qt${{ matrix.qt_ver }}-${{ matrix.architecture }} @@ -165,7 +166,7 @@ jobs: - name: Retrieve ccache cache (Windows MinGW-w64) if: runner.os == 'Windows' && matrix.msystem != '' && inputs.build_type == 'Debug' - uses: actions/cache@v3.2.2 + uses: actions/cache@v3.2.3 with: path: '${{ github.workspace }}\.ccache' key: ${{ matrix.os }}-mingw-w64 |