1 Commits

Author SHA1 Message Date
Renovate Bot
37e0c49a3e Update dependency ws.schild:jave-all-deps to v3.5.0 2024-12-27 00:02:07 +00:00
8 changed files with 19 additions and 51 deletions

View File

@@ -3,8 +3,8 @@ name: Production deployment
on: on:
push: push:
tags: branches:
- 'v*' - master
env: env:
IMAGE_NAME: "jdrbot" IMAGE_NAME: "jdrbot"
@@ -17,14 +17,7 @@ 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@v4 uses: actions/checkout@v3
- 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:

View File

@@ -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 }}

View File

@@ -1,17 +1,15 @@
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 WORKDIR /app
COPY . /app COPY . /app
RUN ./gradlew shadowJar 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" 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"]

View File

@@ -26,16 +26,16 @@ repositories {
} }
dependencies { 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 '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:33.4.8-jre' implementation 'com.google.guava:guava:31.1-jre'
implementation 'com.github.oshi:oshi-core:6.8.2' implementation 'com.github.oshi:oshi-core:6.6.5'
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.17' implementation 'org.slf4j:slf4j-simple:2.0.16'
implementation 'org.apache.commons:commons-lang3:3.18.0' implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'dev.arbjerg:lavaplayer:2.2.4' implementation 'dev.arbjerg:lavaplayer:2.2.2'
implementation 'net.dv8tion:JDA:5.6.1' implementation 'net.dv8tion:JDA:5.0.0-beta.13'
implementation 'org.reflections:reflections:0.10.2' implementation 'org.reflections:reflections:0.10.2'
} }

Binary file not shown.

View File

@@ -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.14.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

6
gradlew vendored
View File

@@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;; NONSTOP* ) nonstop=true ;;
esac esac
CLASSPATH="\\\"\\\"" CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# 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, 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. # 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" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available. # Stop when "xargs" is not available.

4
gradlew.bat vendored
View File

@@ -70,11 +70,11 @@ goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH= set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @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 :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell