From 7dfd315512c0449474c4089f1911a3738557976c Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sun, 18 Dec 2022 17:33:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20cicd=20=D1=81=20=D0=BF=D0=BE=D0=BC=D0=BE=D1=89?= =?UTF-8?q?=D1=8C=D1=8E=20drone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 33 +++++++++++++++++++ .gitlab-ci.yml | 17 ---------- pom.xml | 28 +++++++++++----- telegram-consumer/pom.xml | 2 +- .../telegram-consumer-main/pom.xml | 2 +- .../telegram-consumer-quarkus/pom.xml | 2 +- .../telegram-consumer-simple/pom.xml | 2 +- telegram-context/pom.xml | 2 +- .../telegram-context-main/pom.xml | 2 +- .../telegram-context-quarkus/pom.xml | 2 +- .../telegram-context-simple/pom.xml | 2 +- telegram-core/pom.xml | 2 +- telegram-core/telegram-core-main/pom.xml | 2 +- telegram-core/telegram-core-quarkus/pom.xml | 2 +- telegram-core/telegram-core-simple/pom.xml | 2 +- telegram-domain/pom.xml | 2 +- telegram-sender/pom.xml | 2 +- telegram-sender/telegram-sender-main/pom.xml | 2 +- .../telegram-sender-quarkus/pom.xml | 2 +- .../telegram-sender-simple/pom.xml | 2 +- telegram-simple/pom.xml | 2 +- 21 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 .drone.yml delete mode 100644 .gitlab-ci.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..670e29f --- /dev/null +++ b/.drone.yml @@ -0,0 +1,33 @@ +kind: pipeline +type: docker +name: haiti-framework + +steps: + + - name: publish maven central + image: maven:3.8.5-openjdk-17 + privileged: true + volumes: + - name: m2 + path: /root/.m2/repository + environment: + GPG_PRIVATE_KEY: + from_secret: GPG_PRIVATE_KEY + MAVEN_SETTINGS: + from_secret: MAVEN_SETTINGS + GPG_PASSPHRASE: + from_secret: GPG_PASSPHRASE + commands: + - echo "$GPG_PRIVATE_KEY" >> gpg.key + - echo "$MAVEN_SETTINGS" >> maven-settings.xml + - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key + - mvn --settings maven-settings.xml -U -P ossrh,release clean deploy + +trigger: + ref: + - refs/tags/v.*.*.* + +volumes: + - name: m2 + host: + path: /drone/volume/m2 \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index fbaa16f..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,17 +0,0 @@ -image: maven:3.8.5-openjdk-17 -variables: - MAVEN_OPTS: "-Dmaven.repo.local=./.m2/repository" - -stages: - - deploy - -deploy: - stage: deploy - only: - - /^v.*$/ - except: - - branches - before_script: - - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import $GPG_PRIVATE_KEY - script: - - 'mvn --settings $MAVEN_SETTINGS -U -P ossrh,release clean deploy' \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9a9295c..ac1cab4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.44 + 0.0.45-SNAPSHOT pom @@ -38,7 +38,7 @@ UTF-8 UTF-8 - 0.0.32 + 0.0.41 6.3.0 2.0.0 @@ -48,6 +48,7 @@ 3.2.1 3.4.0 3.0.1 + 3.0.0-M7 @@ -127,12 +128,6 @@ ${project.version} - - dev.struchkov.godfather.telegram - telegram-core - ${project.version} - - dev.struchkov.godfather.telegram telegram-consumer @@ -289,6 +284,19 @@ ${java.version} + + org.apache.maven.plugins + maven-release-plugin + ${plugin.maven.release.ver} + + clean compile + install + v.@{project.version} + true + false + true + + @@ -313,6 +321,10 @@ release + + org.apache.maven.plugins + maven-release-plugin + org.sonatype.plugins nexus-staging-maven-plugin diff --git a/telegram-consumer/pom.xml b/telegram-consumer/pom.xml index 09b574d..52750e8 100644 --- a/telegram-consumer/pom.xml +++ b/telegram-consumer/pom.xml @@ -6,7 +6,7 @@ telegram-bot dev.struchkov.godfather.telegram - 0.0.44 + 0.0.45-SNAPSHOT telegram-consumer diff --git a/telegram-consumer/telegram-consumer-main/pom.xml b/telegram-consumer/telegram-consumer-main/pom.xml index 3984be8..3c2d5cc 100644 --- a/telegram-consumer/telegram-consumer-main/pom.xml +++ b/telegram-consumer/telegram-consumer-main/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.44 + 0.0.45-SNAPSHOT telegram-consumer-main diff --git a/telegram-consumer/telegram-consumer-quarkus/pom.xml b/telegram-consumer/telegram-consumer-quarkus/pom.xml index 859adb6..a390ff8 100644 --- a/telegram-consumer/telegram-consumer-quarkus/pom.xml +++ b/telegram-consumer/telegram-consumer-quarkus/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.44 + 0.0.45-SNAPSHOT telegram-consumer-quarkus diff --git a/telegram-consumer/telegram-consumer-simple/pom.xml b/telegram-consumer/telegram-consumer-simple/pom.xml index 454826d..925715d 100644 --- a/telegram-consumer/telegram-consumer-simple/pom.xml +++ b/telegram-consumer/telegram-consumer-simple/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.44 + 0.0.45-SNAPSHOT telegram-consumer-simple diff --git a/telegram-context/pom.xml b/telegram-context/pom.xml index 577c3dc..79a8e03 100644 --- a/telegram-context/pom.xml +++ b/telegram-context/pom.xml @@ -6,7 +6,7 @@ telegram-bot dev.struchkov.godfather.telegram - 0.0.44 + 0.0.45-SNAPSHOT telegram-context diff --git a/telegram-context/telegram-context-main/pom.xml b/telegram-context/telegram-context-main/pom.xml index 00c921f..81d4c22 100644 --- a/telegram-context/telegram-context-main/pom.xml +++ b/telegram-context/telegram-context-main/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-context - 0.0.44 + 0.0.45-SNAPSHOT telegram-context-main diff --git a/telegram-context/telegram-context-quarkus/pom.xml b/telegram-context/telegram-context-quarkus/pom.xml index e12837c..5d363e6 100644 --- a/telegram-context/telegram-context-quarkus/pom.xml +++ b/telegram-context/telegram-context-quarkus/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-context - 0.0.44 + 0.0.45-SNAPSHOT telegram-context-quarkus diff --git a/telegram-context/telegram-context-simple/pom.xml b/telegram-context/telegram-context-simple/pom.xml index 1f9b6fd..c1410e6 100644 --- a/telegram-context/telegram-context-simple/pom.xml +++ b/telegram-context/telegram-context-simple/pom.xml @@ -6,7 +6,7 @@ telegram-context dev.struchkov.godfather.telegram - 0.0.44 + 0.0.45-SNAPSHOT telegram-context-simple diff --git a/telegram-core/pom.xml b/telegram-core/pom.xml index 299dfc2..5a45309 100644 --- a/telegram-core/pom.xml +++ b/telegram-core/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.44 + 0.0.45-SNAPSHOT diff --git a/telegram-core/telegram-core-main/pom.xml b/telegram-core/telegram-core-main/pom.xml index 8b287de..e79c6e4 100644 --- a/telegram-core/telegram-core-main/pom.xml +++ b/telegram-core/telegram-core-main/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-core - 0.0.44 + 0.0.45-SNAPSHOT telegram-core-main diff --git a/telegram-core/telegram-core-quarkus/pom.xml b/telegram-core/telegram-core-quarkus/pom.xml index 954e14d..f79f7c6 100644 --- a/telegram-core/telegram-core-quarkus/pom.xml +++ b/telegram-core/telegram-core-quarkus/pom.xml @@ -6,7 +6,7 @@ telegram-core dev.struchkov.godfather.telegram - 0.0.44 + 0.0.45-SNAPSHOT telegram-core-quarkus diff --git a/telegram-core/telegram-core-simple/pom.xml b/telegram-core/telegram-core-simple/pom.xml index 1920fc1..f67ff2f 100644 --- a/telegram-core/telegram-core-simple/pom.xml +++ b/telegram-core/telegram-core-simple/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-core - 0.0.44 + 0.0.45-SNAPSHOT telegram-core-simple diff --git a/telegram-domain/pom.xml b/telegram-domain/pom.xml index a636ea9..e70f30f 100644 --- a/telegram-domain/pom.xml +++ b/telegram-domain/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.44 + 0.0.45-SNAPSHOT telegram-domain diff --git a/telegram-sender/pom.xml b/telegram-sender/pom.xml index fc06359..4eddbc8 100644 --- a/telegram-sender/pom.xml +++ b/telegram-sender/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.44 + 0.0.45-SNAPSHOT telegram-sender diff --git a/telegram-sender/telegram-sender-main/pom.xml b/telegram-sender/telegram-sender-main/pom.xml index d8eb0a5..af3a2ab 100644 --- a/telegram-sender/telegram-sender-main/pom.xml +++ b/telegram-sender/telegram-sender-main/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.44 + 0.0.45-SNAPSHOT telegram-sender-main diff --git a/telegram-sender/telegram-sender-quarkus/pom.xml b/telegram-sender/telegram-sender-quarkus/pom.xml index 7754ea1..8a0bf99 100644 --- a/telegram-sender/telegram-sender-quarkus/pom.xml +++ b/telegram-sender/telegram-sender-quarkus/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.44 + 0.0.45-SNAPSHOT telegram-sender-quarkus diff --git a/telegram-sender/telegram-sender-simple/pom.xml b/telegram-sender/telegram-sender-simple/pom.xml index 86980c1..ed36ae5 100644 --- a/telegram-sender/telegram-sender-simple/pom.xml +++ b/telegram-sender/telegram-sender-simple/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.44 + 0.0.45-SNAPSHOT telegram-sender-simple diff --git a/telegram-simple/pom.xml b/telegram-simple/pom.xml index f906a61..6b42d8f 100644 --- a/telegram-simple/pom.xml +++ b/telegram-simple/pom.xml @@ -6,7 +6,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.44 + 0.0.45-SNAPSHOT telegram-simple