| author | |
| committer | |
| log | 2676da61a6ce0808509872a267c8bbd307410966 |
| tree | c9c5105f29c0c25d73b2852e2de3b2af68d301e5 |
| parent | 9dfd1a7c8a79cd5213878c56695f2fcb8aa25580 |
3 files changed, 13 insertions(+), 14 deletions(-)
.travis.yml-6| ... | @@ -1,17 +1,11 @@ | ... | @@ -1,17 +1,11 @@ |
| 1 | sudo: required | 1 | sudo: required |
| 2 | services: | 2 | services: |
| 3 | - docker | 3 | - docker |
| 4 | addons: | ||
| 5 | artifacts: | ||
| 6 | working_dir: artifacts | ||
| 7 | target_paths: | ||
| 8 | - /builds | ||
| 9 | os: | 4 | os: |
| 10 | - linux | 5 | - linux |
| 11 | - osx | 6 | - osx |
| 12 | dist: trusty | 7 | dist: trusty |
| 13 | osx_image: xcode8.3 | 8 | osx_image: xcode8.3 |
| 14 | sudo: required | ||
| 15 | language: cpp | 9 | language: cpp |
| 16 | before_install: | 10 | before_install: |
| 17 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi | 11 | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi |
ci/travis_linux_install+1-1| ... | @@ -4,4 +4,4 @@ set -x | ... | @@ -4,4 +4,4 @@ set -x |
| 4 | 4 | ||
| 5 | sudo apt-get remove -y llvm-* | 5 | sudo apt-get remove -y llvm-* |
| 6 | sudo rm -rf /usr/local/* | 6 | sudo rm -rf /usr/local/* |
| 7 | sudo apt-get install -y clang-6.0 libclang-6.0 libclang-6.0-dev llvm-6.0 llvm-6.0-dev liblld-6.0 liblld-6.0-dev cmake wine1.6-amd64 | 7 | sudo apt-get install -y clang-6.0 libclang-6.0 libclang-6.0-dev llvm-6.0 llvm-6.0-dev liblld-6.0 liblld-6.0-dev cmake wine1.6-amd64 s3cmd |
ci/travis_linux_script+12-7| ... | @@ -8,11 +8,16 @@ export CXX=clang++-6.0 | ... | @@ -8,11 +8,16 @@ export CXX=clang++-6.0 |
| 8 | echo $PATH | 8 | echo $PATH |
| 9 | mkdir build | 9 | mkdir build |
| 10 | cd build | 10 | cd build |
| 11 | cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) | 11 | # cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) |
| 12 | make -j2 install | 12 | # make -j2 install |
| 13 | ./zig build --build-file ../build.zig test | 13 | # ./zig build --build-file ../build.zig test |
| 14 | 14 | ||
| 15 | cd $TRAVIS_BUILD_DIR | 15 | if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then |
| 16 | rm .gitignore | 16 | mkdir $TRAVIS_BUILD_DIR/artifacts |
| 17 | git clean -fd | 17 | docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT |
| 18 | docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT | 18 | echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg |
| 19 | echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg | ||
| 20 | s3cmd put -P $TRAVIS_BUILD_DIR/artifacts/* s3://ziglang.org/builds/ | ||
| 21 | touch empty | ||
| 22 | 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) | ||
| 23 | fi |