From 81ac0edbb4a706b54de5840ecb55155c0847596b Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 23 Oct 2020 01:05:26 +0100 Subject: [PATCH] . --- .drone/drone-home.jsonnet | 56 ++++----------------------------------- .drone/drone-home.yml | 10 ++----- .drone/package.json | 2 +- .drone/yarn.lock | 8 +++--- 4 files changed, 12 insertions(+), 64 deletions(-) diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index c301832..1735ac2 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -36,58 +36,21 @@ local defs = [ secrets: [], images: defs, }, - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'registry', - ], - }, - }, + ), save(config)( defs, [ 'guacamole-postgresql', ], - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'save', - ], - }, - }, + ), print(config)( [], publicSecrets, secretSecrets, - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'print', - ], - }, - }, - + ), build(config)( [], - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'build', - ], - }, - }, + ), deploy(config)( [], publicSecrets, @@ -97,14 +60,5 @@ local defs = [ 'REGISTRY_PORT', 'REGISTRY_PASSWORD', ], - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'production', - ], - }, - }, + ), ] diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 1f1e7a2..bb0f91c 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -196,7 +196,7 @@ trigger: event: - promote target: - - save + - sve --- kind: pipeline @@ -276,12 +276,6 @@ volumes: host: path: /etc/docker/daemon.json -trigger: - event: - - promote - target: - - build - --- kind: pipeline type: docker @@ -333,6 +327,6 @@ trigger: event: - promote target: - - production + - deploy ... diff --git a/.drone/package.json b/.drone/package.json index aa629eb..a4a1c50 100644 --- a/.drone/package.json +++ b/.drone/package.json @@ -4,6 +4,6 @@ "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" }, "dependencies": { - "@sigyl/jsonnet-drone": "^0.4.1" + "@sigyl/jsonnet-drone": "^0.4.2" } } diff --git a/.drone/yarn.lock b/.drone/yarn.lock index 415f02c..5901a6d 100644 --- a/.drone/yarn.lock +++ b/.drone/yarn.lock @@ -12,10 +12,10 @@ resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== -"@sigyl/jsonnet-drone@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.1.tgz#3527edb00f8bb860de1658f4c9fa6f81f932d3b7" - integrity sha512-+TOx51KJG1RxrPRZ2lPpia7a6Ms5UvkyLIuXuumPtenyxJ/pivY1TdcLvSAvFgVZHMjh9CxBCuOu8vNT1fPy2A== +"@sigyl/jsonnet-drone@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.2.tgz#8b34bae3a1a560414df5e3ecdf49c8f73c78771b" + integrity sha512-WBydSUcPkGtVQBzn6UmXiMcHPYow5/B0OFTpGdCD7h6EqUkvfJON+79NpXo7FOAt0PD2EQJzUVAkUBoMiUgfgw== dependencies: "@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-drone-environment" "0.0.5"