diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 10:37:10 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 10:37:10 +0300 |
| commit | fcfb3d2df786c94ded97778fa241f9c05e73a7cf (patch) | |
| tree | 8cc7184f3a011c7e5423bb6740ecfa1f3a643f83 /.github | |
| parent | 8abe6b6732aa18b49199755c89dcedb90ae9c4b6 (diff) | |
| parent | 9908e115aa6bdfcceefd1425406d1b6d1c1bdec4 (diff) | |
| download | PrismLauncher-fcfb3d2df786c94ded97778fa241f9c05e73a7cf.tar.gz PrismLauncher-fcfb3d2df786c94ded97778fa241f9c05e73a7cf.tar.bz2 PrismLauncher-fcfb3d2df786c94ded97778fa241f9c05e73a7cf.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into visit_mod_page
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/trigger_release.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0a0943a..a6a6ecea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,11 +86,11 @@ jobs: - os: macos-12 name: macOS - macosx_deployment_target: 10.15 + macosx_deployment_target: 11.0 qt_ver: 6 qt_host: mac qt_arch: '' - qt_version: '6.5.1' + qt_version: '6.5.0' qt_modules: 'qt5compat qtimageformats' qt_tools: '' diff --git a/.github/workflows/trigger_release.yml b/.github/workflows/trigger_release.yml index 3c56a38e..f19b8398 100644 --- a/.github/workflows/trigger_release.yml +++ b/.github/workflows/trigger_release.yml @@ -47,7 +47,7 @@ jobs: mv PrismLauncher-macOS-Legacy*/PrismLauncher.tar.gz PrismLauncher-macOS-Legacy-${{ env.VERSION }}.tar.gz mv PrismLauncher-macOS*/PrismLauncher.tar.gz PrismLauncher-macOS-${{ env.VERSION }}.tar.gz - tar -czf PrismLauncher-${{ env.VERSION }}.tar.gz PrismLauncher-${{ env.VERSION }} + tar --exclude='.git' -czf PrismLauncher-${{ env.VERSION }}.tar.gz PrismLauncher-${{ env.VERSION }} for d in PrismLauncher-Windows-MSVC*; do cd "${d}" || continue |