From cf09480a71225b4d9f8764aa1c944ac82b13aadb Mon Sep 17 00:00:00 2001 From: flyingfishflash Date: Wed, 10 Mar 2021 17:09:06 -0500 Subject: [PATCH 1/3] feat(ci): drone - deploy to development or production servers --- .drone.yml | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4ed851a9..02ad1232 100644 --- a/.drone.yml +++ b/.drone.yml @@ -327,6 +327,39 @@ trigger: - tag ref: - refs/heads/feature-* + +depends_on: + - "frontend - publish" + - "backend - publish" + +clone: + disable: true + +steps: + - name: deploy to development + image: appleboy/drone-ssh + settings: + host: + from_secret: ssh_host_dev + username: + from_secret: ssh_username + key: + from_secret: ssh_key + script: + - cd docker + - ansible-playbook dev.yaml -i inventory.yaml -e do=restart --tags=ledger + # otherwise: docker-compose up stacks/ledger/docker-compose.yaml -d --remove-orphans + +--- +kind: pipeline +name: deploy to production +type: docker + +trigger: + event: + - push + - tag + ref: - refs/tags/* depends_on: @@ -341,12 +374,12 @@ steps: image: appleboy/drone-ssh settings: host: - from_secret: ssh_host + from_secret: ssh_host_prd username: from_secret: ssh_username key: from_secret: ssh_key script: - cd docker - - ansible-playbook docker-0.yaml -i inventory.yaml -e do=restart --tags=ledger + - ansible-playbook prd.yaml -i inventory.yaml -e do=restart --tags=ledger # otherwise: docker-compose up stacks/ledger/docker-compose.yaml -d --remove-orphans From d9bbe1914ffe808fe5968d8af148d3696529fe0f Mon Sep 17 00:00:00 2001 From: flyingfishflash Date: Thu, 11 Mar 2021 12:55:47 -0500 Subject: [PATCH 2/3] fix(build): use jacoco 0.8.7-SNAPSHOT for JDK 15 support --- backend/build.gradle | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/build.gradle b/backend/build.gradle index 04cea57b..00f03b08 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -28,6 +28,11 @@ repositories { maven { url = uri('https://oss.jfrog.org/artifactory/oss-snapshot-local/') } + + // can be removed when jacoco 0.8.7 is released + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + } } dependencies { @@ -104,7 +109,10 @@ bootRun { jvmArgs = ["-Duser.timezone=UTC"] } - +// can be removed when jacoco 0.8.7 is released +jacoco { + toolVersion = '0.8.7-SNAPSHOT' +} jacocoTestReport { From 5f6cc729ce58c6327c5267bf909c7190e259512a Mon Sep 17 00:00:00 2001 From: flyingfishflash Date: Thu, 11 Mar 2021 12:58:55 -0500 Subject: [PATCH 3/3] refactor(build): update dependencies - spotless 5.11.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f35fcfa5..09cce3c8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.diffplug.spotless' version '5.8.2' + id 'com.diffplug.spotless' version '5.11.0' id 'fr.brouillard.oss.gradle.jgitver' version '0.10.0-rc03' id 'com.geoffgranum.gradle-conventional-changelog' version '0.3.1' id "com.github.breadmoirai.github-release" version "2.2.12"