mirror of https://github.com/AxioDL/metaforce.git
ci: Add macOS qt5 to PATH; fix Windows install dir
This commit is contained in:
parent
1843eef976
commit
dce1c1f882
|
@ -109,6 +109,7 @@ jobs:
|
|||
# universal qt5 from macports
|
||||
curl -LSfs https://axiodl.com/files/qt-$Qt_VERSION.mpkg -o /tmp/qt-$Qt_VERSION.mpkg
|
||||
sudo installer -pkg /tmp/qt-$Qt_VERSION.mpkg -target /
|
||||
echo /opt/local/libexec/qt5/bin >> $GITHUB_PATH
|
||||
|
||||
# setup buildcache
|
||||
curl -LSfs https://github.com/mbitsnbites/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-macos.zip -o /tmp/buildcache-macos.zip
|
||||
|
|
|
@ -127,6 +127,7 @@ jobs:
|
|||
# universal qt5 from macports
|
||||
curl -LSfs https://axiodl.com/files/qt-$Qt_VERSION.mpkg -o /tmp/qt-$Qt_VERSION.mpkg
|
||||
sudo installer -pkg /tmp/qt-$Qt_VERSION.mpkg -target /
|
||||
echo /opt/local/libexec/qt5/bin >> $GITHUB_PATH
|
||||
|
||||
# setup buildcache
|
||||
curl -LSfs https://github.com/mbitsnbites/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-macos.zip -o /tmp/buildcache-macos.zip
|
||||
|
@ -242,7 +243,7 @@ jobs:
|
|||
run: buildcache -s
|
||||
|
||||
- name: Upload debug information
|
||||
working-directory: ${{github.workspace}}/out/install
|
||||
working-directory: ${{env.BUILD_DIR}}/install
|
||||
env:
|
||||
SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
|
||||
SENTRY_URL: ${{secrets.SENTRY_URL}}
|
||||
|
@ -255,8 +256,8 @@ jobs:
|
|||
with:
|
||||
name: metaforce-${{env.METAFORCE_VERSION}}-win32-msvc-x86_64
|
||||
path: |
|
||||
out/install/*.exe
|
||||
out/install/debug.7z
|
||||
${{env.BUILD_DIR}}/install/*.exe
|
||||
${{env.BUILD_DIR}}/install/debug.7z
|
||||
|
||||
build-windows-clang:
|
||||
name: Build Windows (Clang x86_64)
|
||||
|
@ -332,5 +333,5 @@ jobs:
|
|||
with:
|
||||
name: metaforce-${{env.METAFORCE_VERSION}}-win32-clang-x86_64
|
||||
path: |
|
||||
out/install/*.exe
|
||||
out/install/debug.7z
|
||||
${{env.BUILD_DIR}}/install/*.exe
|
||||
${{env.BUILD_DIR}}/install/debug.7z
|
||||
|
|
|
@ -342,7 +342,8 @@
|
|||
"displayName": "(Internal) Linux CI GCC",
|
||||
"targets": [
|
||||
"install"
|
||||
]
|
||||
],
|
||||
"verbose": true
|
||||
},
|
||||
{
|
||||
"name": "x-linux-ci-clang",
|
||||
|
@ -351,7 +352,8 @@
|
|||
"displayName": "(Internal) Linux CI Clang",
|
||||
"targets": [
|
||||
"install"
|
||||
]
|
||||
],
|
||||
"verbose": true
|
||||
},
|
||||
{
|
||||
"name": "x-macos-ci",
|
||||
|
@ -360,7 +362,8 @@
|
|||
"displayName": "(Internal) macOS CI",
|
||||
"targets": [
|
||||
"install"
|
||||
]
|
||||
],
|
||||
"verbose": true
|
||||
},
|
||||
{
|
||||
"name": "x-windows-ci-msvc",
|
||||
|
@ -369,7 +372,8 @@
|
|||
"displayName": "(Internal) Windows CI MSVC",
|
||||
"targets": [
|
||||
"install"
|
||||
]
|
||||
],
|
||||
"verbose": true
|
||||
},
|
||||
{
|
||||
"name": "x-windows-ci-clang",
|
||||
|
@ -378,7 +382,8 @@
|
|||
"displayName": "(Internal) Windows CI Clang",
|
||||
"targets": [
|
||||
"install"
|
||||
]
|
||||
],
|
||||
"verbose": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue