Compare commits

...

7 Commits

18 changed files with 78 additions and 47 deletions

View File

@ -17,32 +17,15 @@ steps:
from_secret: MAVEN_SETTINGS from_secret: MAVEN_SETTINGS
GPG_PASSPHRASE: GPG_PASSPHRASE:
from_secret: GPG_PASSPHRASE from_secret: GPG_PASSPHRASE
SSH_KEY:
from_secret: SSH_KEY
commands: commands:
- eval $(ssh-agent -s) - echo "$GPG_PRIVATE_KEY" >> gpg.key
- mkdir -p ~/.ssh - echo "$MAVEN_SETTINGS" >> maven-settings.xml
- chmod 700 ~/.ssh - gpg --pinentry-mode loopback --passphrase $GPG_PASSPHRASE --import gpg.key
- echo "$SSH_KEY" | ssh-add - - mvn --settings maven-settings.xml -U -P ossrh,release clean deploy
- ssh-keyscan -p 222 git.struchkov.dev >> ~/.ssh/known_hosts
- git branch -a
# - echo "test" >> test.txt
# - git add --all
# - git commit -m test
# - git remote add deploy ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git
# - git remote -v
# - git push deploy HEAD:master
# - ssh-keyscan -t rsa git.struchkov.dev >> ~/.ssh/known_hosts
# - chmod 644 ~/.ssh/known_hosts
# - 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 -T 1C -U release:clean release:prepare release:perform --batch-mode
trigger: trigger:
branch: ref:
- master - refs/tags/v.*.*.*
volumes: volumes:
- name: m2 - name: m2

50
.drone.yml.back Normal file
View File

@ -0,0 +1,50 @@
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
SSH_KEY:
from_secret: SSH_KEY
commands:
- eval $(ssh-agent -s)
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- echo "$SSH_KEY" | ssh-add -
- ssh-keyscan -p 222 git.struchkov.dev >> ~/.ssh/known_hosts
- git branch -a
# - echo "test" >> test.txt
# - git add --all
# - git commit -m test
# - git remote add deploy ssh://git@git.struchkov.dev:222/Godfather-Bots/godfather.git
# - git remote -v
# - git push deploy HEAD:master
# - ssh-keyscan -t rsa git.struchkov.dev >> ~/.ssh/known_hosts
# - chmod 644 ~/.ssh/known_hosts
# - 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 -T 1C -U release:clean release:prepare release:perform --batch-mode
trigger:
branch:
- master
volumes:
- name: m2
host:
path: /drone/volume/m2

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-context</artifactId> <artifactId>bot-context</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-context-main</artifactId> <artifactId>bot-context-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-context</artifactId> <artifactId>bot-context</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-context-quarkus</artifactId> <artifactId>bot-context-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-context</artifactId> <artifactId>bot-context</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-context-simple</artifactId> <artifactId>bot-context-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-context</artifactId> <artifactId>bot-context</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-core</artifactId> <artifactId>bot-core</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-core-main</artifactId> <artifactId>bot-core-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-core</artifactId> <artifactId>bot-core</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-core-quarkus</artifactId> <artifactId>bot-core-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>bot-core</artifactId> <artifactId>bot-core</artifactId>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-core-simple</artifactId> <artifactId>bot-core-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-core</artifactId> <artifactId>bot-core</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>bot-data</artifactId> <artifactId>bot-data</artifactId>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-data-main</artifactId> <artifactId>bot-data-main</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-data</artifactId> <artifactId>bot-data</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-data-quarkus</artifactId> <artifactId>bot-data-quarkus</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>bot-data</artifactId> <artifactId>bot-data</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-data-simple</artifactId> <artifactId>bot-data-simple</artifactId>

View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<artifactId>bot-data</artifactId> <artifactId>bot-data</artifactId>

View File

@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>bot-domain</artifactId> <artifactId>bot-domain</artifactId>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

16
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>dev.struchkov.godfather</groupId> <groupId>dev.struchkov.godfather</groupId>
<artifactId>godfather-bot</artifactId> <artifactId>godfather-bot</artifactId>
<version>0.0.40-SNAPSHOT</version> <version>0.0.42-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
@ -49,6 +49,7 @@
<plugin.maven.source.ver>3.2.1</plugin.maven.source.ver> <plugin.maven.source.ver>3.2.1</plugin.maven.source.ver>
<plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver> <plugin.maven.javadoc.ver>3.4.0</plugin.maven.javadoc.ver>
<plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver> <plugin.maven.gpg.ver>3.0.1</plugin.maven.gpg.ver>
<plugin.maven.release.ver>3.0.0-M7</plugin.maven.release.ver>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -220,12 +221,13 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>3.0.0-M7</version> <version>${plugin.maven.release.ver}</version>
<configuration> <configuration>
<preparationGoals>clean install</preparationGoals> <preparationGoals>clean compile</preparationGoals>
<goal>install</goal>
<tagNameFormat>v.@{project.version}</tagNameFormat> <tagNameFormat>v.@{project.version}</tagNameFormat>
<releaseProfiles>release,ossrh</releaseProfiles> <autoVersionSubmodules>true</autoVersionSubmodules>
<pushChanges>true</pushChanges> <pushChanges>false</pushChanges>
<localCheckout>true</localCheckout> <localCheckout>true</localCheckout>
</configuration> </configuration>
</plugin> </plugin>
@ -253,10 +255,6 @@
<id>release</id> <id>release</id>
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.sonatype.plugins</groupId> <groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId> <artifactId>nexus-staging-maven-plugin</artifactId>