Fix indentation

This commit is contained in:
Simon Walton 2019-12-03 13:51:55 -08:00
parent efc0c00d07
commit b0e5f9ca69

View file

@ -122,94 +122,94 @@ jobs:
echo ::set-env name=HF_PFX_PASSPHRASE::${{secrets.pfx_key}} echo ::set-env name=HF_PFX_PASSPHRASE::${{secrets.pfx_key}}
echo "::set-env name=HF_PFX_FILE::${{runner.workspace}}\build\codesign.pfx" echo "::set-env name=HF_PFX_FILE::${{runner.workspace}}\build\codesign.pfx"
fi fi
- name: Checkout - name: Checkout
uses: actions/checkout@v1 uses: actions/checkout@v1
with: with:
submodules: true submodules: true
fetch-depth: 1 fetch-depth: 1
- name: Install python modules - name: Install python modules
run: $PYTHON_EXEC -m pip install boto3 PyGithub run: $PYTHON_EXEC -m pip install boto3 PyGithub
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build run: cmake -E make_directory ${{runner.workspace}}/build
- name: Install apt packages (Linux) - name: Install apt packages (Linux)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0 run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
- name: Configure CMake - name: Configure CMake
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |
echo '${{ toJson(env) }}' echo '${{ toJson(env) }}'
uname uname
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY $CMAKE_EXTRA cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY $CMAKE_EXTRA
# macOS # macOS
- name: Build Console (macOS) - name: Build Console (macOS)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target packaged-server-console run: cmake --build . --config $BUILD_TYPE --target packaged-server-console
- name: Build Application (macOS) - name: Build Application (macOS)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target $APP_NAME run: cmake --build . --config $BUILD_TYPE --target $APP_NAME
- name: Build Domain Server (macOS) - name: Build Domain Server (macOS)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
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
- name: Build Assignment Client (macOS) - name: Build Assignment Client (macOS)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
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
- name: Build Installer (macOS) - name: Build Installer (macOS)
if: matrix.os == 'macOS-latest' if: matrix.os == 'macOS-latest'
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target package run: cmake --build . --config $BUILD_TYPE --target package
#build_full_win32: #build_full_win32:
- name: Build Console (Windows) - name: Build Console (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target packaged-server-console run: cmake --build . --config $BUILD_TYPE --target packaged-server-console
- name: Build Application (Windows) - name: Build Application (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target $APP_NAME run: cmake --build . --config $BUILD_TYPE --target $APP_NAME
- name: Build Domain Server (Windows) - name: Build Domain Server (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
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
- name: Build Assignment Client (Windows) - name: Build Assignment Client (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
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
- name: Build Installer (Windows) - name: Build Installer (Windows)
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: cmake --build . --config $BUILD_TYPE --target package run: cmake --build . --config $BUILD_TYPE --target package
#build_full_linux: #build_full_linux:
- name: Build (Linux) - name: Build (Linux)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
# Parallel make: # Parallel make:
run: cmake --build . -- -j3 run: cmake --build . -- -j3
- name: Build Ubuntu Docker (Linux) - name: Build Ubuntu Docker (Linux)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: | run: |
cp $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/hifi.conf . cp $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/hifi.conf .
docker build -t $LINUX_DOCKER_IMAGE_NAME -f $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/Dockerfile ./ docker build -t $LINUX_DOCKER_IMAGE_NAME -f $GITHUB_WORKSPACE/tools/ci-scripts/linux-gha/Dockerfile ./
- name: Export Docker image (Linux) - name: Export Docker image (Linux)
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
shell: bash shell: bash
working-directory: ${{runner.workspace}}/build working-directory: ${{runner.workspace}}/build
run: docker save -o ${{runner.workspace}}/build/hifi_docker_image.tar $LINUX_DOCKER_IMAGE_NAME run: docker save -o ${{runner.workspace}}/build/hifi_docker_image.tar $LINUX_DOCKER_IMAGE_NAME