From 074297953e16197209eb05fb3df7076e4f36b12d Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 21:16:16 +0200 Subject: [PATCH 1/6] Start running tests as part of CI pipeline --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1cd5be6..96758bc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,6 +3,6 @@ name: default steps: - name: greetings - image: alpine + image: ziglang/static-base:llvm15-aarch64-2 commands: - - env + - zig test src/main.zig -- 2.34.1 From e5f94fda0f365ec74f915b22f56a83e4d9f4b856 Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 20:32:59 +0100 Subject: [PATCH 2/6] Manually assemble build environment in CI script --- .drone.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 96758bc..dd78df7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,16 @@ kind: pipeline -name: default +name: Build and Test steps: -- name: greetings - image: ziglang/static-base:llvm15-aarch64-2 +- name: Build and Test + image: alpine commands: + - apk update && apk add curl xz + - mkdir -p /deps + - pushd /deps + - curl https://ziglang.org/deps/zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz -O + - tar xf zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz + - mv zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1/ local/ + - popd + - RUN apk --no-cache add libc-dev - zig test src/main.zig -- 2.34.1 From 3b234a175b6369d50fd4201cdf1d64582be78931 Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 20:34:21 +0100 Subject: [PATCH 3/6] Attempt removal of pushd / popd command dependency --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index dd78df7..9ff4fd5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,10 +7,10 @@ steps: commands: - apk update && apk add curl xz - mkdir -p /deps - - pushd /deps + - cd /deps - curl https://ziglang.org/deps/zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz -O - tar xf zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz - mv zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1/ local/ - - popd + - cd /drone/src/ - RUN apk --no-cache add libc-dev - zig test src/main.zig -- 2.34.1 From f555e6bf30b9e9b8804da3188875c1eab775563c Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 20:35:51 +0100 Subject: [PATCH 4/6] Remove typo in CI script --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9ff4fd5..908e9ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,5 +12,5 @@ steps: - tar xf zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz - mv zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1/ local/ - cd /drone/src/ - - RUN apk --no-cache add libc-dev + - apk --no-cache add libc-dev - zig test src/main.zig -- 2.34.1 From 4bd1c57899d5d8d536af029390e9cf2cb4d3db85 Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 20:39:21 +0100 Subject: [PATCH 5/6] Replace environment self-assembly with pre-build Zig image --- .drone.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 908e9ce..8b6002d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,14 +3,6 @@ name: Build and Test steps: - name: Build and Test - image: alpine + image: euantorano/zig:0.9.1 commands: - - apk update && apk add curl xz - - mkdir -p /deps - - cd /deps - - curl https://ziglang.org/deps/zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz -O - - tar xf zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1.tar.xz - - mv zig+llvm+lld+clang-$(uname -m)-linux-musl-0.9.1/ local/ - - cd /drone/src/ - - apk --no-cache add libc-dev - zig test src/main.zig -- 2.34.1 From d5166fb467b0d40e211e71fce52092327d16d575 Mon Sep 17 00:00:00 2001 From: kayomn Date: Sat, 1 Oct 2022 20:40:23 +0100 Subject: [PATCH 6/6] Tidy up CI naming conventions --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8b6002d..0760faa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,8 @@ kind: pipeline -name: Build and Test +name: continuous integration steps: -- name: Build and Test +- name: build & test image: euantorano/zig:0.9.1 commands: - zig test src/main.zig -- 2.34.1