From 51e50e7c460736a08ac6ca930fadd6eb20462622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Tue, 9 Aug 2022 15:51:05 +0100 Subject: [PATCH 1/5] CI: Split setup and test steps --- .drone.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ae99284..423bd62 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,12 +3,17 @@ type: docker name: default steps: -- name: test +- name: setup image: gitea.kosmos.org/kredits/docker-ci:latest commands: - cp -r /app/node_modules /drone/src/node_modules - chown -R drone:drone /drone/src - su drone -c 'npm install' +- name: test + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: - su drone -c 'npm run devchain' & - sleep 5 - su drone -c 'npm test' + depends_on: + - setup -- 2.25.1 From 0d6702fd2bd4fa6d6840c2fb98342e49ee298495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Tue, 9 Aug 2022 15:55:09 +0100 Subject: [PATCH 2/5] Add JS and Solidity linting to CI --- .drone.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.drone.yml b/.drone.yml index 423bd62..a4bc3c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,3 +17,15 @@ steps: - su drone -c 'npm test' depends_on: - setup +- name: lint-js + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - su drone -c 'npm run lint:wrapper' + depends_on: + - setup +- name: lint-contracts + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - su drone -c 'npm run lint:contracts' + depends_on: + - setup -- 2.25.1 From fd93993a1beb24eec766da5d6887df8524961b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Tue, 9 Aug 2022 15:57:06 +0100 Subject: [PATCH 3/5] Nicer step names --- .drone.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index a4bc3c6..87a140f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,6 +9,18 @@ steps: - cp -r /app/node_modules /drone/src/node_modules - chown -R drone:drone /drone/src - su drone -c 'npm install' +- name: lint js + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - su drone -c 'npm run lint:wrapper' + depends_on: + - setup +- name: lint contracts + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - su drone -c 'npm run lint:contracts' + depends_on: + - setup - name: test image: gitea.kosmos.org/kredits/docker-ci:latest commands: @@ -17,15 +29,3 @@ steps: - su drone -c 'npm test' depends_on: - setup -- name: lint-js - image: gitea.kosmos.org/kredits/docker-ci:latest - commands: - - su drone -c 'npm run lint:wrapper' - depends_on: - - setup -- name: lint-contracts - image: gitea.kosmos.org/kredits/docker-ci:latest - commands: - - su drone -c 'npm run lint:contracts' - depends_on: - - setup -- 2.25.1 From 98348dc544101b919abd7d46b4487c597e12c400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Tue, 9 Aug 2022 16:10:37 +0100 Subject: [PATCH 4/5] Build contracts in CI --- .drone.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.drone.yml b/.drone.yml index 87a140f..e569f8d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,6 +21,14 @@ steps: - su drone -c 'npm run lint:contracts' depends_on: - setup +- name: build contracts + image: gitea.kosmos.org/kredits/docker-ci:latest + commands: + - su drone -c 'npm run devchain' & + - sleep 5 + - su drone -c 'npm run build' + depends_on: + - setup - name: test image: gitea.kosmos.org/kredits/docker-ci:latest commands: @@ -29,3 +37,4 @@ steps: - su drone -c 'npm test' depends_on: - setup + - build contracts -- 2.25.1 From 46b1bbfbf25d1bf3399017d2cd06244ad2e56b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 10 Aug 2022 11:18:28 +0100 Subject: [PATCH 5/5] Disable contract linting for now So we can continue with actual tests, and fix the linter warnings separately from other ongoing work. --- .drone.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index e569f8d..003e6f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,12 +15,12 @@ steps: - su drone -c 'npm run lint:wrapper' depends_on: - setup -- name: lint contracts - image: gitea.kosmos.org/kredits/docker-ci:latest - commands: - - su drone -c 'npm run lint:contracts' - depends_on: - - setup +# - name: lint contracts +# image: gitea.kosmos.org/kredits/docker-ci:latest +# commands: +# - su drone -c 'npm run lint:contracts' +# depends_on: +# - setup - name: build contracts image: gitea.kosmos.org/kredits/docker-ci:latest commands: -- 2.25.1