From 43f5054a90e9f357b38880c7d1c208b96744162e Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 24 Oct 2019 19:04:48 -0400 Subject: [PATCH] ci: drone tests only aarch64 with docker image --- ci/drone/drone.yml | 19 +++---------------- ci/drone/linux_script | 19 +++++++++---------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/ci/drone/drone.yml b/ci/drone/drone.yml index 03df5cad30..7ab25c9987 100644 --- a/ci/drone/drone.yml +++ b/ci/drone/drone.yml @@ -1,25 +1,12 @@ --- kind: pipeline -name: test-aarch64-linux-gnu +name: test-aarch64-linux-musl platform: arch: arm64 steps: - name: build-and-test - image: alpine:edge + image: ziglang/static-base:llvm9-1 commands: - - ./ci/drone/linux_script aarch64 linux musl - ---- -kind: pipeline -name: test-arm-linux-gnueabihf - -platform: - arch: arm - -steps: -- name: build-and-test - image: alpine:edge - commands: - - ./ci/drone/linux_script arm linux musleabihf + - ./ci/drone/linux_script diff --git a/ci/drone/linux_script b/ci/drone/linux_script index ccf01ccc59..f6dd70eadf 100755 --- a/ci/drone/linux_script +++ b/ci/drone/linux_script @@ -3,22 +3,21 @@ set -x set -e -TRIPLEARCH="$0" -TRIPLEOS="$1" -TRIPLEABI="$2" +TRIPLEARCH="$(uname -m)" BUILDDIR="$(pwd)" DISTDIR="$(pwd)/dist" apk update -apk add gcc g++ cmake make libc-dev binutils libstdc++ py3-pip clang-static llvm9-static xz llvm9-dev clang-dev zlib-static libxml2-dev +apk add py3-pip xz pip3 install s3cmd mkdir build cd build -cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" +cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local make -j$(nproc) install -./zig build test +./zig build test-behavior +#./zig build test if [ -n "$DRONE_PULL_REQUEST" ]; then mv ../LICENSE "$DISTDIR/" @@ -27,8 +26,8 @@ if [ -n "$DRONE_PULL_REQUEST" ]; then rmdir "$DISTDIR/bin" GITBRANCH="$DRONE_BRANCH" - VERSION=$("$DISTDIR/zig" version) - DIRNAME="zig-$TRIPLEOS-$TRIPLEARCH-$VERSION" + VERSION="$("$DISTDIR/zig" version)" + DIRNAME="zig-linux-$TRIPLEARCH-$VERSION" TARBALL="$DIRNAME.tar.xz" mv "$DISTDIR" "$DIRNAME" tar cfJ "$TARBALL" "$DIRNAME" @@ -38,12 +37,12 @@ if [ -n "$DRONE_PULL_REQUEST" ]; then SHASUM=$(shasum -a 256 $TARBALL | cut '-d ' -f1) BYTESIZE=$(wc -c < $TARBALL) - JSONFILE="$TRIPLEARCH-$TRIPLEOS-$GITBRANCH.json" + JSONFILE="$TRIPLEARCH-linux-$GITBRANCH.json" touch $JSONFILE echo "{\"tarball\": \"$TARBALL\"," >>$JSONFILE echo "\"shasum\": \"$SHASUM\"," >>$JSONFILE echo "\"size\": \"$BYTESIZE\"}" >>$JSONFILE s3cmd put -P --add-header="Cache-Control: max-age=0, must-revalidate" "$JSONFILE" "s3://ziglang.org/builds/$JSONFILE" - s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$TRIPLEARCH-$TRIPLEOS-$VERSION.json" + s3cmd put -P "$JSONFILE" "s3://ziglang.org/builds/$TRIPLEARCH-linux-$VERSION.json" fi