Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:18:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Master-build fixes

Browse source
This commit is contained in:
Simon Walton 2019-12-06 14:56:08 -08:00
parent 439340315e
commit b2e4133f64
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
.github/workflows/master_build.yml vendored
View file

@ -9,7 +9,8 @@ env:
#APP_NAME: gpu-frame-player #APP_NAME: gpu-frame-player
APP_NAME: interface APP_NAME: interface
BUILD_TYPE: Release BUILD_TYPE: Release
BUCKET_NAME: hifi-gh-builds #BUCKET_NAME: hifi-gh-builds
BUCKET_NAME: hifi-content/simon
CI_BUILD: Github CI_BUILD: Github
CMAKE_BACKTRACE_URL: https://highfidelity.sp.backtrace.io:6098 CMAKE_BACKTRACE_URL: https://highfidelity.sp.backtrace.io:6098
CMAKE_BACKTRACE_TOKEN: ${{ secrets.backtrace_token }} CMAKE_BACKTRACE_TOKEN: ${{ secrets.backtrace_token }}
@ -113,7 +114,7 @@ jobs:
echo ::set-env name=GIT_COMMIT_SHORT::`echo $GIT_COMMIT | cut -c1-7` echo ::set-env name=GIT_COMMIT_SHORT::`echo $GIT_COMMIT | cut -c1-7`
# Linux build variables # Linux build variables
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
echo ::set-env name=INSTALLER_EXT::tgz echo ::set-env name=INSTALLER_EXT::tar.gz
fi fi
# Mac build variables # Mac build variables
if [ "${{ matrix.os }}" = "macOS-latest" ]; then if [ "${{ matrix.os }}" = "macOS-latest" ]; then
@ -151,6 +152,7 @@ jobs:
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
echo ::set-env name=PYTHON_EXEC::python3 echo ::set-env name=PYTHON_EXEC::python3
echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE" echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE"
echo ::set-env name=CMAKE_BUILD_ARGS::-j3
fi fi
# Mac build variables # Mac build variables
if [ "${{ matrix.os }}" = "macOS-latest" ]; then if [ "${{ matrix.os }}" = "macOS-latest" ]; then
@ -200,9 +202,8 @@ jobs:
- name: Build Application - name: Build Application
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
shell: bash shell: bash
run: cmake --build . --config $BUILD_TYPE --target $APP_NAME run: cmake --build . --config $BUILD_TYPE --target $APP_NAME -- $CMAKE_BUILD_ARGS
- name: Build Console - name: Build Console
if: matrix.os != 'ubuntu-latest'
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
shell: bash shell: bash
run: cmake --build . --config $BUILD_TYPE --target packaged-server-console run: cmake --build . --config $BUILD_TYPE --target packaged-server-console
@ -210,12 +211,12 @@ jobs:
if: matrix.build_type == 'full' if: matrix.build_type == 'full'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target domain-server run: cmake --build . --config $BUILD_TYPE --target domain-server -- $CMAKE_BUILD_ARGS
- name: Build Assignment Client (FullBuild) - name: Build Assignment Client (FullBuild)
if: matrix.build_type == 'full' if: matrix.build_type == 'full'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target assignment-client run: cmake --build . --config $BUILD_TYPE --target assignment-client -- $CMAKE_BUILD_ARGS
- name: Build Installer - name: Build Installer
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
shell: bash shell: bash
@ -229,11 +230,15 @@ jobs:
if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'full' if: matrix.os == 'ubuntu-latest' && matrix.build_type == 'full'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
env:
DOCKER_EXPORT
run: | run: |
DOCKER_EXPORT_NAME=HighFidelity-Beta-$RELEASE_NUMBER-$GIT_COMMIT_SHORT-docker.tar
cp $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/hifi.conf . cp $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/hifi.conf .
docker build -t HighFidelity-Beta:$RELEASE_NUMBER -f $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/Dockerfile ./ docker build -t highfidelity-beta:$RELEASE_NUMBER -f $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/Dockerfile ./
docker save -o $DOCKER_EXPORT_NAME highfidelity-beta:$RELEASE_NUMBER
gzip $DOCKER_EXPORT_NAME
- name: Upload Artifact - name: Upload Artifact
if: matrix.os != 'ubuntu-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
env: env: