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 @@...@@ -1,17 +1,11 @@
1sudo: required1sudo: required
2services:2services:
3 - docker3 - docker
4addons:
5 artifacts:
6 working_dir: artifacts
7 target_paths:
8 - /builds
9os:4os:
10 - linux5 - linux
11 - osx6 - osx
12dist: trusty7dist: trusty
13osx_image: xcode8.38osx_image: xcode8.3
14sudo: required
15language: cpp9language: cpp
16before_install:10before_install:
17 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ci/travis_linux_before_install; fi11 - 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
44
5sudo apt-get remove -y llvm-*5sudo apt-get remove -y llvm-*
6sudo rm -rf /usr/local/*6sudo 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-amd647sudo 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
8echo $PATH8echo $PATH
9mkdir build9mkdir build
10cd build10cd build
11cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)11# cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)
12make -j2 install12# make -j2 install
13./zig build --build-file ../build.zig test13# ./zig build --build-file ../build.zig test
1414
15cd $TRAVIS_BUILD_DIR15if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
16rm .gitignore16 mkdir $TRAVIS_BUILD_DIR/artifacts
17git clean -fd17 docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR/artifacts",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT
18docker run -it --mount type=bind,source="$TRAVIS_BUILD_DIR",target=/z ziglang/static-base:llvm6-1 -j2 $TRAVIS_COMMIT18 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