From c40477fd007b82b3653046f22e04859e74f2aa17 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Thu, 25 Mar 2021 10:57:26 +0100 Subject: [PATCH 1/3] [run-ci] --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 76934832a..9c31efc26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -89,6 +89,7 @@ jobs: sudo apt-get update -q sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libx11-dev sudo apt-get install libxi-dev libgconf-2-4 ccache lcov xvfb + sudo apt-get install libboost-all-dev ccache --max-size 1G ccache -z - name: Build Externals @@ -106,14 +107,11 @@ jobs: ./make.sh -G "Unix Makefiles" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCOSMOSCOUT_COVERAGE_INFO=On -DCOSMOSCOUT_UNIT_TESTS=On - -DBOOST_ROOT=$BOOST_ROOT_1_72_0 -DBoost_ARCHITECTURE=-x64 - name: Run Tests run: | - export LD_LIBRARY_PATH="$BOOST_ROOT_1_72_0/lib:$LD_LIBRARY_PATH" ./install/linux-Release/bin/run_tests.sh - name: Run Graphical Tests run: | - export LD_LIBRARY_PATH="$BOOST_ROOT_1_72_0/lib:$LD_LIBRARY_PATH" ./install/linux-Release/bin/run_graphical_tests.sh - name: Upload Results of Failed Test uses: actions/upload-artifact@v1 @@ -123,7 +121,6 @@ jobs: path: install/linux-Release/bin/test - name: Calculate Test Coverage run: | - export LD_LIBRARY_PATH="$BOOST_ROOT_1_72_0/lib:$LD_LIBRARY_PATH" ./lcov.sh - name: Upload Coverage Info uses: coverallsapp/github-action@master @@ -160,6 +157,7 @@ jobs: sudo apt-get update -q sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libx11-dev sudo apt-get install libxi-dev libgconf-2-4 ccache + sudo apt-get install libboost-all-dev ccache --max-size 1G ccache -z - name: Build Externals @@ -176,14 +174,12 @@ jobs: run: > ./make.sh -G "Unix Makefiles" -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache - -DCOSMOSCOUT_UNIT_TESTS=On -DBOOST_ROOT=$BOOST_ROOT_1_72_0 -DBoost_ARCHITECTURE=-x64 + -DCOSMOSCOUT_UNIT_TESTS=On - name: Run Tests run: | - export LD_LIBRARY_PATH="$BOOST_ROOT_1_72_0/lib:$LD_LIBRARY_PATH" ./install/linux-Release/bin/run_tests.sh - name: Run Graphical Tests run: | - export LD_LIBRARY_PATH="$BOOST_ROOT_1_72_0/lib:$LD_LIBRARY_PATH" ./install/linux-Release/bin/run_graphical_tests.sh - name: Upload Results of Failed Test uses: actions/upload-artifact@v1 From 19c2a282d17a6ae95d897563975b25b2ccc6997a Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Thu, 25 Mar 2021 12:06:15 +0100 Subject: [PATCH 2/3] [run-ci] --- .github/workflows/build.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9c31efc26..20754aa1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -198,6 +198,8 @@ jobs: ( contains(github.ref, 'master') && !contains(github.event.head_commit.message, '[no-ci]') ) || ( contains(github.ref, 'develop') && !contains(github.event.head_commit.message, '[no-ci]') ) || contains(github.event.head_commit.message, '[run-ci]') + env: + BOOST_ROOT_1_72_0: C:\hostedtoolcache\windows\Boost\1.72.0\x86_64 steps: - name: Checkout Repository uses: actions/checkout@v2 @@ -214,6 +216,15 @@ jobs: pip install clcache clcache -M 2147483648 clcache -z + - name: Download Boost + run: | + # From https://github.com/actions/virtual-environments/issues/2667 + $url = "https://github.com/actions/boost-versions/releases/download/1.72.0-20200608.4/boost-1.72.0-win32-msvc14.2-x86_64.tar.gz" + (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.tar.gz") + 7z.exe x "$env:TEMP\boost.tar.gz" -o"$env:TEMP\boostArchive" -y | Out-Null + 7z.exe x "$env:TEMP\boostArchive" -o"$env:TEMP\boost" -y | Out-Null + Push-Location -Path "$env:TEMP\boost" + Invoke-Expression .\setup.ps1 - name: Build Externals shell: cmd run: > From 24cdc5caee2f6fe98115e0698c31376c8d772119 Mon Sep 17 00:00:00 2001 From: Simon Schneegans Date: Thu, 25 Mar 2021 12:53:01 +0100 Subject: [PATCH 3/3] Fix deploy script --- .github/workflows/deploy.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 2a1eac548..c266a9154 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -38,10 +38,11 @@ jobs: sudo apt-get update -q sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev libx11-dev sudo apt-get install libxi-dev libgconf-2-4 + sudo apt-get install libboost-all-dev - name: Build Externals run: ./make_externals.sh -G "Unix Makefiles" - name: Build CosmoScout VR - run: ./make.sh -G "Unix Makefiles" -DBOOST_ROOT=$BOOST_ROOT_1_72_0 -DBoost_ARCHITECTURE=-x64 + run: ./make.sh -G "Unix Makefiles" - name: Create Release run: | mv install/linux-Release cosmoscout-vr @@ -58,11 +59,22 @@ jobs: release_windows: name: Windows runs-on: windows-2019 + env: + BOOST_ROOT_1_72_0: C:\hostedtoolcache\windows\Boost\1.72.0\x86_64 steps: - name: Checkout Repository uses: actions/checkout@v2 - name: Checkout Submodules run: git submodule update --init + - name: Download Boost + run: | + # From https://github.com/actions/virtual-environments/issues/2667 + $url = "https://github.com/actions/boost-versions/releases/download/1.72.0-20200608.4/boost-1.72.0-win32-msvc14.2-x86_64.tar.gz" + (New-Object System.Net.WebClient).DownloadFile($url, "$env:TEMP\boost.tar.gz") + 7z.exe x "$env:TEMP\boost.tar.gz" -o"$env:TEMP\boostArchive" -y | Out-Null + 7z.exe x "$env:TEMP\boostArchive" -o"$env:TEMP\boost" -y | Out-Null + Push-Location -Path "$env:TEMP\boost" + Invoke-Expression .\setup.ps1 - name: Build Externals shell: cmd run: make_externals.bat -G "Visual Studio 16 2019" -A x64