Skip to content

Commit

Permalink
Disable sample=true for release builds on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
touilleMan committed Jan 30, 2020
1 parent b3f4b9c commit b22f0a4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ before_build:
build_script:
# Un-comment if you're in deep troubles...
# - set SCONS_MSCOMMON_DEBUG=-
- scons platform=%TARGET_PLATFORM% release_suffix=%APPVEYOR_REPO_TAG_NAME% sample=true release
- ps: if($env:APPVEYOR_REPO_TAG -eq "false") { $env:SAMPLE_ARG = "sample=true" }
- scons platform=%TARGET_PLATFORM% release_suffix=%APPVEYOR_REPO_TAG_NAME% %SAMPLE_ARG% release

after_build:
- ls -l build
Expand Down
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ before_script:

script:
- set -e # Enable fail on first error
- if [[ "$TRAVIS_TAG" == "" ]]; then export SAMPLE_ARG='sample=true'; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM checkstyle; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH sample=true release; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH sample=true release; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH $SAMPLE_ARG release; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then scons platform=$TARGET_PLATFORM CC=$CC release_suffix=$TRAVIS_BRANCH $SAMPLE_ARG release; fi
# Tests need x11 server with opengl3 or compile godot with platform=server (both not working so far...)
# - LIBGL_ALWAYS_SOFTWARE=1 scons debugger=valgrind platform=$TARGET_PLATFORM CC=$CC test
- set +e
Expand Down

0 comments on commit b22f0a4

Please sign in to comment.