mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Update to code review
This commit is contained in:
parent
bc1044692a
commit
a9d8c9904b
1 changed files with 5 additions and 7 deletions
12
.github/workflows/pr_build.yml
vendored
12
.github/workflows/pr_build.yml
vendored
|
@ -66,16 +66,14 @@ jobs:
|
|||
if [[ "${{ matrix.os }}" = "ubuntu-"* || "${{ matrix.os }}" = *"debian"* ]]; then
|
||||
echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
|
||||
echo "INSTALLER_EXT=*" >> $GITHUB_ENV
|
||||
if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
|
||||
echo "CMAKE_BUILD_EXTRA=-- -j4" >> $GITHUB_ENV
|
||||
else
|
||||
echo "CMAKE_BUILD_EXTRA=-- -j3" >> $GITHUB_ENV
|
||||
fi
|
||||
echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
|
||||
if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
|
||||
echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV
|
||||
echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
|
||||
echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
|
||||
fi
|
||||
if [ "${{ matrix.os }}" =~ "aarch64" ]; then
|
||||
echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
|
||||
fi
|
||||
if [ "${{ matrix.build_type }}" = "full" ]; then
|
||||
echo "CMAKE_EXTRA=-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
|
||||
else
|
||||
|
@ -130,7 +128,7 @@ jobs:
|
|||
fi
|
||||
|
||||
- name: Clear Working Directory
|
||||
if: startsWith(matrix.os, 'windows') || matrix.os == 'self-hosted_debian-11_aarch64'
|
||||
if: startsWith(matrix.os, 'windows') || contains(matrix.os, 'self-hosted')
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}
|
||||
run: rm -rf ./*
|
||||
|
|
Loading…
Reference in a new issue