diff options
| author | Lukas Larsson <[email protected]> | 2018-05-22 12:27:22 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-05-22 12:27:22 +0200 |
| commit | 26acf6e6abd3112f2a984f85dc627594a214073b (patch) | |
| tree | 7bf5ea44667ea0cdf484df94f14260006720d14c | |
| parent | a23181ebd9b081c267542983f3178814433d6450 (diff) | |
| parent | 61d12b823a232d0f4c27c006b8111faf46c75d5d (diff) | |
| download | otp-26acf6e6abd3112f2a984f85dc627594a214073b.tar.gz otp-26acf6e6abd3112f2a984f85dc627594a214073b.tar.bz2 otp-26acf6e6abd3112f2a984f85dc627594a214073b.zip | |
Merge branch 'lukas/travis-do-release'
* lukas/travis-do-release:
travis: Do release when building 32-bit
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | scripts/build-otp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 5499eb22c4..1438ea865a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ matrix: services: - docker script: - - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp && ./otp_build tests && scripts/run-smoke-tests && bin/dialyzer --build_plt --apps erts kernel stdlib" + - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp release && ./otp_build tests && scripts/run-smoke-tests && bin/dialyzer --build_plt --apps erts kernel stdlib" - env: Linux64Dialyzer os: linux script: diff --git a/scripts/build-otp b/scripts/build-otp index 92031c79c8..ad0eb07359 100755 --- a/scripts/build-otp +++ b/scripts/build-otp @@ -40,4 +40,8 @@ do_and_log "Autoconfing" autoconf do_and_log "Configuring" configure do_and_log "Building OTP" boot -a +if [ $1 = "release" ]; then + do_and_log "Releasing OTP" release -a +fi + exit 0 |