Compare commits
27 Commits
37e0c49a3e
...
renovate/w
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f14681bae0 | ||
|
|
f88759ee64 | ||
|
|
7132940874 | ||
|
|
bff962af46 | ||
|
|
642bc67fe3 | ||
|
|
6c1de86ad9 | ||
|
|
82a139a6a1 | ||
|
|
a980a69908 | ||
|
|
0c0cb791ce | ||
|
|
780c672e56 | ||
|
|
03665f5556 | ||
|
|
e805f12a9d | ||
|
|
dd7dfaedaf | ||
|
|
3c0103c4ed | ||
|
|
6c222009b2 | ||
|
|
e077d18760 | ||
|
|
2afc52e858 | ||
| 17a094b727 | |||
|
|
0514110fa0 | ||
|
|
4e49b098da | ||
| c89e740e02 | |||
| 9b82cb2823 | |||
| b1608ee414 | |||
|
|
329435f68f | ||
|
|
3fa6425e99 | ||
|
|
d81eea7a6b | ||
|
|
52a71c6381 |
@@ -3,8 +3,8 @@ name: Production deployment
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
tags:
|
||||||
- master
|
- 'v*'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
IMAGE_NAME: "jdrbot"
|
IMAGE_NAME: "jdrbot"
|
||||||
@@ -17,7 +17,14 @@ jobs:
|
|||||||
timeout-minutes: 30
|
timeout-minutes: 30
|
||||||
steps:
|
steps:
|
||||||
- name: Check out repo's default branch
|
- name: Check out repo's default branch
|
||||||
uses: actions/checkout@v3
|
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
|
||||||
- name: Docker login
|
- name: Docker login
|
||||||
uses: https://gitea.skydust.fr/actions/docker-login-skydust@main
|
uses: https://gitea.skydust.fr/actions/docker-login-skydust@main
|
||||||
with:
|
with:
|
||||||
|
|||||||
23
.gitea/workflows/release.yml
Normal file
23
.gitea/workflows/release.yml
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
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,15 +1,17 @@
|
|||||||
FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jdk AS builder
|
FROM public.ecr.aws/docker/library/eclipse-temurin:23.0.1_11-jdk AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . /app
|
COPY . /app
|
||||||
RUN ./gradlew shadowJar
|
RUN ./gradlew shadowJar
|
||||||
|
|
||||||
FROM public.ecr.aws/docker/library/eclipse-temurin:20.0.2_9-jre AS runner
|
FROM public.ecr.aws/docker/library/eclipse-temurin:23.0.1_11-jre AS runner
|
||||||
LABEL authors="skydust"
|
LABEL authors="skydust"
|
||||||
WORKDIR /app
|
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/*
|
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
|
COPY --from=builder /app/build/libs/JdrBot.jar /app/JdrBot.jar
|
||||||
COPY start.sh /app
|
COPY start.sh /app
|
||||||
|
|
||||||
CMD ["/bin/bash","./start.sh"]
|
CMD ["/bin/bash","./start.sh"]
|
||||||
|
|||||||
14
build.gradle
14
build.gradle
@@ -26,16 +26,16 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'net.lingala.zip4j:zip4j:2.10.0'
|
implementation 'net.lingala.zip4j:zip4j:2.11.5'
|
||||||
implementation 'club.minnced:opus-java:1.1.1'
|
implementation 'club.minnced:opus-java:1.1.1'
|
||||||
implementation 'ws.schild:jave-all-deps:3.5.0'
|
implementation 'ws.schild:jave-all-deps:3.5.0'
|
||||||
implementation 'com.google.guava:guava:31.1-jre'
|
implementation 'com.google.guava:guava:33.4.8-jre'
|
||||||
implementation 'com.github.oshi:oshi-core:6.6.5'
|
implementation 'com.github.oshi:oshi-core:6.8.2'
|
||||||
implementation 'com.github.oshi:oshi-json:3.13.6'
|
implementation 'com.github.oshi:oshi-json:3.13.6'
|
||||||
implementation 'org.slf4j:slf4j-simple:2.0.16'
|
implementation 'org.slf4j:slf4j-simple:2.0.17'
|
||||||
implementation 'org.apache.commons:commons-lang3:3.12.0'
|
implementation 'org.apache.commons:commons-lang3:3.18.0'
|
||||||
implementation 'dev.arbjerg:lavaplayer:2.2.2'
|
implementation 'dev.arbjerg:lavaplayer:2.2.4'
|
||||||
implementation 'net.dv8tion:JDA:5.0.0-beta.13'
|
implementation 'net.dv8tion:JDA:5.6.1'
|
||||||
implementation 'org.reflections:reflections:0.10.2'
|
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
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
6
gradlew
vendored
6
gradlew
vendored
@@ -114,7 +114,7 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH="\\\"\\\""
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -205,7 +205,7 @@ fi
|
|||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
# Collect all arguments for the java command:
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# and any embedded shellness will be escaped.
|
# 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
|
# * 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.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-classpath "$CLASSPATH" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
4
gradlew.bat
vendored
4
gradlew.bat
vendored
@@ -70,11 +70,11 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%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" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
Reference in New Issue
Block a user