Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/fix ci #248

Merged
merged 3 commits into from
Mar 25, 2021
Merged

Feature/fix ci #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c40477f
[run-ci]
Schneegans Mar 25, 2021
19c2a28
[run-ci]
Schneegans Mar 25, 2021
24cdc5c
Fix deploy script
Schneegans Mar 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -202,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
Expand All @@ -218,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: >
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down