Compare commits
1 Commits
dev
...
33027bb662
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
33027bb662 |
@@ -3,8 +3,8 @@ name: Production deployment
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
branches:
|
||||
- master
|
||||
|
||||
env:
|
||||
IMAGE_NAME: "jdrbot"
|
||||
@@ -17,14 +17,7 @@ jobs:
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- name: Check out repo's default branch
|
||||
uses: actions/checkout@v4
|
||||
- name: Getting version
|
||||
uses: https://gitea.skydust.fr/actions/get-version@main
|
||||
- name: Update java package version
|
||||
run: |
|
||||
log_info "Updating gradle.properties version to $(yellow)$NEW_VERSION"
|
||||
sed -Ei "s|^(version=).*|\1${NEW_VERSION}|" gradle.properties
|
||||
cat gradle.properties
|
||||
uses: actions/checkout@v3
|
||||
- name: Docker login
|
||||
uses: https://gitea.skydust.fr/actions/docker-login-skydust@main
|
||||
with:
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
semver:
|
||||
type: choice
|
||||
description: Choose the semver
|
||||
options:
|
||||
- "Major - Incompatible API changes"
|
||||
- "Minor - Adding functionality in a backward compatible manner"
|
||||
- "Patch - Backward compatible bug fixes"
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: Release
|
||||
runs-on: skydust-runner
|
||||
steps:
|
||||
- name: Release
|
||||
uses: https://gitea.skydust.fr/actions/create-release@main
|
||||
with:
|
||||
semver: ${{ inputs.semver }}
|
||||
token: ${{ secrets.CI_TOKEN }}
|
||||
@@ -1,14 +1,12 @@
|
||||
FROM public.ecr.aws/docker/library/eclipse-temurin:23.0.1_11-jdk AS builder
|
||||
FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jdk AS builder
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN ./gradlew shadowJar
|
||||
|
||||
FROM public.ecr.aws/docker/library/eclipse-temurin:23.0.1_11-jre AS runner
|
||||
FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jre AS runner
|
||||
LABEL authors="skydust"
|
||||
WORKDIR /app
|
||||
|
||||
RUN wget https://repo.zabbix.com/zabbix/7.2/release/ubuntu/pool/main/z/zabbix-release/zabbix-release_latest_7.2+ubuntu24.04_all.deb
|
||||
RUN dpkg -i zabbix-release_latest_7.2+ubuntu24.04_all.deb && rm zabbix-release_latest_7.2+ubuntu24.04_all.deb
|
||||
RUN apt update && apt install -y zabbix-sender && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY --from=builder /app/build/libs/JdrBot.jar /app/JdrBot.jar
|
||||
|
||||
16
build.gradle
16
build.gradle
@@ -26,16 +26,16 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'net.lingala.zip4j:zip4j:2.11.5'
|
||||
implementation 'net.lingala.zip4j:zip4j:2.10.0'
|
||||
implementation 'club.minnced:opus-java:1.1.1'
|
||||
implementation 'ws.schild:jave-all-deps:3.5.0'
|
||||
implementation 'com.google.guava:guava:33.4.8-jre'
|
||||
implementation 'com.github.oshi:oshi-core:6.8.2'
|
||||
implementation 'ws.schild:jave-all-deps:3.3.1'
|
||||
implementation 'com.google.guava:guava:31.1-jre'
|
||||
implementation 'com.github.oshi:oshi-core:6.6.5'
|
||||
implementation 'com.github.oshi:oshi-json:3.13.6'
|
||||
implementation 'org.slf4j:slf4j-simple:2.0.17'
|
||||
implementation 'org.apache.commons:commons-lang3:3.18.0'
|
||||
implementation 'dev.arbjerg:lavaplayer:2.2.4'
|
||||
implementation 'net.dv8tion:JDA:5.6.1'
|
||||
implementation 'org.slf4j:slf4j-simple:2.0.16'
|
||||
implementation 'org.apache.commons:commons-lang3:3.17.0'
|
||||
implementation 'dev.arbjerg:lavaplayer:2.2.2'
|
||||
implementation 'net.dv8tion:JDA:5.0.0-beta.13'
|
||||
implementation 'org.reflections:reflections:0.10.2'
|
||||
}
|
||||
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
6
gradlew
vendored
6
gradlew
vendored
@@ -114,7 +114,7 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -205,7 +205,7 @@ fi
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
|
||||
4
gradlew.bat
vendored
4
gradlew.bat
vendored
@@ -70,11 +70,11 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
Reference in New Issue
Block a user