authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-03 20:33:33-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-03 21:39:03-04:00
log2676da61a6ce0808509872a267c8bbd307410966
treec9c5105f29c0c25d73b2852e2de3b2af68d301e5
parent9dfd1a7c8a79cd5213878c56695f2fcb8aa25580

travis: better s3 artifacts


3 files changed, 13 insertions(+), 14 deletions(-)

.travis.yml-6
......@@ -1,17 +1,11 @@
11sudo: required
22services:
33 - docker
4addons:
5 artifacts:
6 working_dir: artifacts
7 target_paths:
8 - /builds
94os:
105 - linux
116 - osx
127dist: trusty
138osx_image: xcode8.3
14sudo: required
159language: cpp
1610before_install:
1711 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi
ci/travis_linux_install+1-1
......@@ -4,4 +4,4 @@ set -x
44
55sudo apt-get remove -y llvm-*
66sudo rm -rf /usr/local/*
7sudo 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
7sudo 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
88echo $PATH
99mkdir build
1010cd build
11cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)
12make -j2 install
13./zig build --build-file ../build.zig test
11# cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)
12# make -j2 install
13# ./zig build --build-file ../build.zig test
1414
15cd $TRAVIS_BUILD_DIR
16rm .gitignore
17git clean -fd
18docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT
15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
16 mkdir $TRAVIS_BUILD_DIR/artifacts
17 docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",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)
23fi