From 9437e59beab79abc9e75d47c7a829f0863d1c99a Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 12 Jan 2021 15:43:47 -0800 Subject: [PATCH 1/3] Adding build files for the buildkite --- .buildkite/pipeline.yml | 12 ++++++++++++ docker/buildkite/Dockerfile | 3 +++ docker/buildkite/docker-compose.yaml | 12 ++++++++++++ docker/buildkite/run-tests.sh | 6 ++++++ 4 files changed, 33 insertions(+) create mode 100644 .buildkite/pipeline.yml create mode 100644 docker/buildkite/Dockerfile create mode 100644 docker/buildkite/docker-compose.yaml create mode 100755 docker/buildkite/run-tests.sh diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml new file mode 100644 index 000000000..ba5d13d7a --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,12 @@ +steps: + - label: ":java: Unit test" + agents: + queue: "default" + docker: "*" + command: "./gradlew --no-daemon test" + timeout_in_minutes: 15 + plugins: + - docker-compose#v3.0.0: + run: unit-test + config: docker/buildkite/docker-compose.yaml + - wait diff --git a/docker/buildkite/Dockerfile b/docker/buildkite/Dockerfile new file mode 100644 index 000000000..687a594cd --- /dev/null +++ b/docker/buildkite/Dockerfile @@ -0,0 +1,3 @@ +FROM rust:latest + +WORKDIR /sdk-core diff --git a/docker/buildkite/docker-compose.yaml b/docker/buildkite/docker-compose.yaml new file mode 100644 index 000000000..b3216d8da --- /dev/null +++ b/docker/buildkite/docker-compose.yaml @@ -0,0 +1,12 @@ +version: '3.5' + +services: + unit-test: + build: + context: ../../ + dockerfile: ./docker/buildkite/Dockerfile + command: /bin/sh -c "docker/buildkite/run-tests.sh" + environment: + - "USER=unittest" + volumes: + - "../../:/sdk-core" diff --git a/docker/buildkite/run-tests.sh b/docker/buildkite/run-tests.sh new file mode 100755 index 000000000..28c115878 --- /dev/null +++ b/docker/buildkite/run-tests.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env sh +set -e +set -x + +cargo build +cargo test From 3d7349572ccec5f1d22a6330fd9998697d2823e1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 12 Jan 2021 15:47:31 -0800 Subject: [PATCH 2/3] Fix build command --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index ba5d13d7a..6693b31be 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,9 +1,9 @@ steps: - - label: ":java: Unit test" + - label: ":rust: Unit test" agents: queue: "default" docker: "*" - command: "./gradlew --no-daemon test" + command: "cargo test" timeout_in_minutes: 15 plugins: - docker-compose#v3.0.0: From aa9aa59d1f90e17346f9a155c525731820ea2d91 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 12 Jan 2021 15:53:34 -0800 Subject: [PATCH 3/3] Move build files into the proper folder and change some names --- {docker/buildkite => .buildkite/docker}/Dockerfile | 0 docker/buildkite/run-tests.sh => .buildkite/docker/build.sh | 1 - {docker/buildkite => .buildkite/docker}/docker-compose.yaml | 4 ++-- .buildkite/pipeline.yml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) rename {docker/buildkite => .buildkite/docker}/Dockerfile (100%) rename docker/buildkite/run-tests.sh => .buildkite/docker/build.sh (80%) rename {docker/buildkite => .buildkite/docker}/docker-compose.yaml (59%) diff --git a/docker/buildkite/Dockerfile b/.buildkite/docker/Dockerfile similarity index 100% rename from docker/buildkite/Dockerfile rename to .buildkite/docker/Dockerfile diff --git a/docker/buildkite/run-tests.sh b/.buildkite/docker/build.sh similarity index 80% rename from docker/buildkite/run-tests.sh rename to .buildkite/docker/build.sh index 28c115878..602eed46d 100755 --- a/docker/buildkite/run-tests.sh +++ b/.buildkite/docker/build.sh @@ -3,4 +3,3 @@ set -e set -x cargo build -cargo test diff --git a/docker/buildkite/docker-compose.yaml b/.buildkite/docker/docker-compose.yaml similarity index 59% rename from docker/buildkite/docker-compose.yaml rename to .buildkite/docker/docker-compose.yaml index b3216d8da..13d3cc132 100644 --- a/docker/buildkite/docker-compose.yaml +++ b/.buildkite/docker/docker-compose.yaml @@ -4,8 +4,8 @@ services: unit-test: build: context: ../../ - dockerfile: ./docker/buildkite/Dockerfile - command: /bin/sh -c "docker/buildkite/run-tests.sh" + dockerfile: .buildkite/docker/Dockerfile + command: /bin/sh -c ".buildkite/docker/build.sh" environment: - "USER=unittest" volumes: diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6693b31be..d12938d76 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -8,5 +8,5 @@ steps: plugins: - docker-compose#v3.0.0: run: unit-test - config: docker/buildkite/docker-compose.yaml + config: .buildkite/docker/docker-compose.yaml - wait