Compare commits

...

14 Commits

Author SHA1 Message Date
Sheldan
3c1facd1ab [maven-release-plugin] prepare release oneplusbot-1.3.1 2021-03-23 22:49:28 +01:00
Sheldan
3237cf94bd [OPB-3] updating abstracto version to 1.2.1 2021-03-23 22:47:34 +01:00
Sheldan
0167d863bf [maven-release-plugin] prepare for next development iteration 2021-03-23 13:17:14 +01:00
Sheldan
42829faea7 [maven-release-plugin] prepare release oneplusbot-1.3 2021-03-23 13:17:08 +01:00
Sheldan
7e52731247 [OPB-3] hardcoding the abstracto version in the release job for now 2021-03-23 13:16:42 +01:00
Sheldan
38a03649bd [OPB-3] disabling maven log for retrieving the abstracto version 2021-03-23 13:12:30 +01:00
Sheldan
54479ccfc6 [OPB-3] fixing substitution in release job 2021-03-23 13:00:55 +01:00
Sheldan
de2fa4d581 [maven-release-plugin] prepare for next development iteration 2021-03-23 12:54:42 +01:00
Sheldan
6097773e75 [maven-release-plugin] prepare release oneplusbot-1.2 2021-03-23 12:54:36 +01:00
Sheldan
6818e390be [OPB-3] using arguments for deployment docker image build, in order to access the abstracto registry 2021-03-23 12:38:37 +01:00
Sheldan
070893fe6a [maven-release-plugin] prepare for next development iteration 2021-03-23 11:22:47 +01:00
Sheldan
e8d6997ce4 [maven-release-plugin] prepare release oneplusbot-1.1 2021-03-23 11:22:40 +01:00
Sheldan
5498dcb106 [OPB-3] fixing base image for deployment image 2021-03-23 11:21:41 +01:00
Sheldan
18edc1160b [maven-release-plugin] prepare for next development iteration 2021-03-23 10:56:01 +01:00
16 changed files with 30 additions and 22 deletions

View File

@@ -15,7 +15,7 @@ jobs:
java-version: 1.8
- name: Load current version
id: version
run: echo "version=$(mvn --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
- name: Publish to GitHub Packages
run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
env:
@@ -33,4 +33,6 @@ jobs:
run: docker-compose build && docker-compose push
env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
VERSION: ${{ env.version }}
VERSION: ${{ env.version }}
ABSTRACTO_VERSION: 1.2
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>executable</artifactId>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
<artifactId>oneplus-bot-customizations</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -5,13 +5,13 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
<version>1.3.1</version>
<modules>
<module>executable</module>
<module>oneplus-bot-customizations</module>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
<artifactId>deployment</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
<artifactId>deployment</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -1,4 +1,6 @@
FROM abstracto_deployment:latest
ARG ABSTRACTO_REGISTRY_PREFIX=
ARG ABSTRACTO_VERSION=latest
FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION}
MAINTAINER Sheldan
ADD template-artifacts /templates
ADD translation-artifacts /translations

View File

@@ -11,7 +11,11 @@ services:
build: pgAdmin
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
deployment_container:
build: deployment
build:
context: deployment
args:
ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
prometheus:
build: prometheus

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>oneplusbot</artifactId>
<groupId>dev.sheldan.oneplus.bot</groupId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -12,12 +12,12 @@
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.0</version>
<version>1.3.1</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<abstracto.version>1.2</abstracto.version>
<abstracto.version>1.2.1</abstracto.version>
<abstracto.templates.version>1.2</abstracto.templates.version>
</properties>
@@ -54,7 +54,7 @@
<scm>
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
<tag>oneplusbot-1.0</tag>
<tag>oneplusbot-1.3.1</tag>
</scm>
</project>

View File

@@ -3,14 +3,14 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-modules</artifactId>
<packaging>pom</packaging>
<version>1.0</version>
<version>1.3.1</version>
<modules>
<module>starboard-custom</module>
</modules>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-modules</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modules>
@@ -14,7 +14,7 @@
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.0</version>
<version>1.3.1</version>
<packaging>pom</packaging>
</project>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.0</version>
<version>1.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>