diff options
| author | Josh Wolfe <thejoshwolfe@gmail.com> | 2018-04-10 21:46:13 -0400 |
|---|---|---|
| committer | Josh Wolfe <thejoshwolfe@gmail.com> | 2018-04-10 21:46:13 -0400 |
| commit | b553b7ab83894447d53bcdc1b5a10c7cbcd2281f (patch) | |
| tree | a2614c600dfbf57d7c92cfa8268767b60eb75b91 /ci/travis_linux_script | |
| parent | 0ba85ea6ff910c7a49ae036625b945c475c0f58c (diff) | |
| parent | ee3e2790aa85c624fc952bc8326b82d72843bb17 (diff) | |
| download | zig-b553b7ab83894447d53bcdc1b5a10c7cbcd2281f.tar.gz zig-b553b7ab83894447d53bcdc1b5a10c7cbcd2281f.zip | |
Merge branch 'master' into self-hosted-parser
Diffstat (limited to 'ci/travis_linux_script')
| -rwxr-xr-x | ci/travis_linux_script | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/ci/travis_linux_script b/ci/travis_linux_script index d6b9eb9230..9b43dd20fb 100755 --- a/ci/travis_linux_script +++ b/ci/travis_linux_script @@ -8,25 +8,16 @@ export CXX=clang++-6.0 echo $PATH mkdir build cd build -cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -make VERBOSE=1 -make install +cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) +make -j2 install ./zig build --build-file ../build.zig test -./zig test ../test/behavior.zig --target-os windows --target-arch i386 --target-environ msvc -wine zig-cache/test.exe - -./zig test ../test/behavior.zig --target-os windows --target-arch i386 --target-environ msvc --release-fast -wine zig-cache/test.exe - -./zig test ../test/behavior.zig --target-os windows --target-arch i386 --target-environ msvc --release-safe -wine zig-cache/test.exe - -./zig test ../test/behavior.zig --target-os windows --target-arch x86_64 --target-environ msvc -wine64 zig-cache/test.exe - -#./zig test ../test/behavior.zig --target-os windows --target-arch x86_64 --target-environ msvc --release-fast -#wine64 test.exe -# -#./zig test ../test/behavior.zig --target-os windows --target-arch x86_64 --target-environ msvc --release-safe -#wine64 test.exe +if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then + mkdir $TRAVIS_BUILD_DIR/artifacts + docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT + echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg + echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg + s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/ + touch empty + s3cmd put -P empty s3://ziglang.org/builds/zig-linux-x86_64-$TRAVIS_BRANCH.tar.xz --add-header=x-amz-website-redirect-location:/builds/$(ls $TRAVIS_BUILD_DIR/artifacts) +fi |