From 544ed1a1fa36b466ddd58b1a2193a7a8fa5b952d Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 3 Nov 2021 19:52:24 +0100 Subject: [PATCH 1/2] add ci/cd conf (drone) --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1c4c72a..b27712c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,8 +9,9 @@ steps: commands: - npm install when: - event: - - push + branch: + - master + - develop - name: build image: deblan/devenv From 539a81c07ef536b5c9172a956f60653dce8291e3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 3 Nov 2021 20:01:54 +0100 Subject: [PATCH 2/2] add ci/cd conf --- .drone.yml | 13 +++++++++---- .metroline.yml | 6 +----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index b27712c..5980907 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,12 +8,17 @@ steps: image: deblan/devenv commands: - npm install - when: - branch: - - master - - develop - name: build + image: deblan/devenv + commands: + - make npm-build + when: + branch: + - develop + - feature/* + + - name: release image: deblan/devenv volumes: - name: artefacts diff --git a/.metroline.yml b/.metroline.yml index 1461fe8..7917ee0 100644 --- a/.metroline.yml +++ b/.metroline.yml @@ -2,10 +2,6 @@ version: '1' image: deblan/devenv jobs: build: - when: - branch: - - master - - feat/.* script: - npm install - - npm run build + - make npm-build