mirror of
https://github.com/Sheldan/OnePlusBot.git
synced 2026-01-24 05:10:12 +00:00
Compare commits
9 Commits
oneplusbot
...
oneplusbot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb28bb6fd8 | ||
|
|
fad8abe2e3 | ||
|
|
d25f8dc12f | ||
|
|
9190688f45 | ||
|
|
b84177f062 | ||
|
|
6985f329f8 | ||
|
|
a815f7239e | ||
|
|
085e53cebc | ||
|
|
b7a67c8a38 |
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -34,5 +34,5 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
|
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
|
||||||
VERSION: ${{ env.version }}
|
VERSION: ${{ env.version }}
|
||||||
ABSTRACTO_VERSION: 1.2
|
ABSTRACTO_VERSION: 1.2.4
|
||||||
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
|
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>executable</artifactId>
|
<artifactId>executable</artifactId>
|
||||||
@@ -80,6 +80,11 @@
|
|||||||
<artifactId>link-embed-impl</artifactId>
|
<artifactId>link-embed-impl</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>webservices-impl</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>dev.sheldan.abstracto.modules</groupId>
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
<artifactId>starboard-impl</artifactId>
|
<artifactId>starboard-impl</artifactId>
|
||||||
|
|||||||
@@ -17,3 +17,5 @@ management.metrics.tags.application=oneplus-bot
|
|||||||
spring.security.user.name=abstracto
|
spring.security.user.name=abstracto
|
||||||
spring.security.user.password=password
|
spring.security.user.password=password
|
||||||
spring.security.user.roles=USER
|
spring.security.user.roles=USER
|
||||||
|
|
||||||
|
spring.application.name=OnePlusBot
|
||||||
@@ -7,3 +7,5 @@ management.metrics.tags.application=oneplus-bot
|
|||||||
spring.security.user.name= ${REST_USER_NAME}
|
spring.security.user.name= ${REST_USER_NAME}
|
||||||
spring.security.user.password= ${REST_PASSWORD}
|
spring.security.user.password= ${REST_PASSWORD}
|
||||||
spring.security.user.roles=USER
|
spring.security.user.roles=USER
|
||||||
|
|
||||||
|
spring.application.name=OnePlusBot
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||||
<artifactId>oneplus-bot-customizations</artifactId>
|
<artifactId>oneplus-bot-customizations</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>executable</module>
|
<module>executable</module>
|
||||||
<module>oneplus-bot-customizations</module>
|
<module>oneplus-bot-customizations</module>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
||||||
<artifactId>deployment</artifactId>
|
<artifactId>deployment</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -25,3 +25,4 @@ PGADMIN_PORT=5050
|
|||||||
PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
|
PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
|
||||||
PGADMIN_DEFAULT_PASSWORD=admin
|
PGADMIN_DEFAULT_PASSWORD=admin
|
||||||
TOKEN=<INSERT TOKEN>
|
TOKEN=<INSERT TOKEN>
|
||||||
|
YOUTUBE_API_KEY=<INSERT KEY>
|
||||||
@@ -50,6 +50,7 @@ services:
|
|||||||
DB_NAME: ${DATABASE_NAME}
|
DB_NAME: ${DATABASE_NAME}
|
||||||
REST_USER_NAME: ${REST_USER_NAME}
|
REST_USER_NAME: ${REST_USER_NAME}
|
||||||
REST_PASSWORD: ${REST_PASSWORD}
|
REST_PASSWORD: ${REST_PASSWORD}
|
||||||
|
YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
|
||||||
command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
|
command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
|
||||||
ports:
|
ports:
|
||||||
- "${DEBUG_PORT}:5005"
|
- "${DEBUG_PORT}:5005"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
||||||
<artifactId>deployment</artifactId>
|
<artifactId>deployment</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@@ -89,6 +89,16 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
f <artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>starboard-custom-templates</artifactId>
|
<artifactId>starboard-custom-templates</artifactId>
|
||||||
@@ -145,6 +155,7 @@
|
|||||||
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
||||||
<destFileName>starboard.zip</destFileName>
|
<destFileName>starboard.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
||||||
<artifactId>utility</artifactId>
|
<artifactId>utility</artifactId>
|
||||||
@@ -155,6 +166,16 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||||
<artifactId>starboard-custom</artifactId>
|
<artifactId>starboard-custom</artifactId>
|
||||||
@@ -244,6 +265,17 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>webservices-impl</artifactId>
|
||||||
|
<version>${abstracto.version}</version>
|
||||||
|
<classifier>liquibase</classifier>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||||
<artifactId>starboard-custom</artifactId>
|
<artifactId>starboard-custom</artifactId>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
ARG ABSTRACTO_REGISTRY_PREFIX=
|
ARG ABSTRACTO_REGISTRY_PREFIX
|
||||||
ARG ABSTRACTO_VERSION=latest
|
ARG ABSTRACTO_VERSION=latest
|
||||||
FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION}
|
FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest}
|
||||||
MAINTAINER Sheldan
|
MAINTAINER Sheldan
|
||||||
ADD template-artifacts /templates
|
ADD template-artifacts /templates
|
||||||
ADD translation-artifacts /translations
|
ADD translation-artifacts /translations
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
{
|
{
|
||||||
"template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
|
"template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"],
|
||||||
"translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
|
"translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "starboard-custom"],
|
||||||
"liquibase_artifacts": [
|
"liquibase_artifacts": [
|
||||||
{ "zip": "scheduling", "file": "scheduling-changeLog.xml" },
|
{ "zip": "scheduling", "file": "scheduling-changeLog.xml" },
|
||||||
{ "zip": "core", "file": "core-changeLog.xml" },
|
{ "zip": "core", "file": "core-changeLog.xml" },
|
||||||
{ "zip": "utility", "file": "utility-changeLog.xml"},
|
{ "zip": "utility", "file": "utility-changeLog.xml"},
|
||||||
{ "zip": "entertainment", "file": "entertainment-changeLog.xml"},
|
{ "zip": "entertainment", "file": "entertainment-changeLog.xml"},
|
||||||
{ "zip": "link-embed", "file": "link-embed-changeLog.xml"},
|
{ "zip": "link-embed", "file": "link-embed-changeLog.xml"},
|
||||||
|
{ "zip": "webservices", "file": "webservices-changeLog.xml"},
|
||||||
{ "zip": "starboard", "file": "starboard-changeLog.xml"},
|
{ "zip": "starboard", "file": "starboard-changeLog.xml"},
|
||||||
{ "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}
|
{ "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
9
pom.xml
9
pom.xml
@@ -12,13 +12,14 @@
|
|||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<abstracto.version>1.2.2</abstracto.version>
|
<!-- edit in release.yml as well -->
|
||||||
<abstracto.templates.version>1.2.1</abstracto.templates.version>
|
<abstracto.version>1.2.5</abstracto.version>
|
||||||
|
<abstracto.templates.version>1.2.2</abstracto.templates.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -54,7 +55,7 @@
|
|||||||
<scm>
|
<scm>
|
||||||
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
|
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
|
||||||
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
|
||||||
<tag>oneplusbot-1.3.2</tag>
|
<tag>oneplusbot-1.3.5</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -3,14 +3,14 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>oneplus-bot-modules</artifactId>
|
<artifactId>oneplus-bot-modules</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>starboard-custom</module>
|
<module>starboard-custom</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>oneplus-bot-modules</artifactId>
|
<artifactId>oneplus-bot-modules</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||||
<artifactId>translations</artifactId>
|
<artifactId>translations</artifactId>
|
||||||
<version>1.3.2</version>
|
<version>1.3.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user