Fix build

This commit is contained in:
SebClem 2022-05-15 16:40:00 +02:00
parent 4118116ee9
commit 35093a1bd1
Signed by: sebclem
GPG Key ID: 5A4308F6A359EA50
3 changed files with 6 additions and 20 deletions

View File

@ -17,10 +17,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up JDK 1.8 - name: Set up JDK 17
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 17
- name: Grant execute permission for gradlew - name: Grant execute permission for gradlew
run: chmod +x gradlew run: chmod +x gradlew
@ -35,8 +35,9 @@ jobs:
path: build/libs/ path: build/libs/
build-docker: build-docker:
runs-on: [ ubuntu-latest ] runs-on: ubuntu-latest
needs: [ build-gradle ] needs:
- build-gradle
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

View File

@ -1,4 +1,4 @@
FROM openjdk:8-jre-buster FROM openjdk:17.0.2
WORKDIR /bot_src WORKDIR /bot_src
ARG BUILD_NBR ARG BUILD_NBR
ARG BRANCH_NAME ARG BRANCH_NAME
@ -6,7 +6,5 @@ ARG BRANCH_NAME
ARG GITHUB_RUN_NUMBER ARG GITHUB_RUN_NUMBER
ADD build/libs/ClaptrapBot-*.jar /bot_src/bot.jar ADD build/libs/ClaptrapBot-*.jar /bot_src/bot.jar
RUN java -version RUN java -version
ENV PORT=8080
ENV TOKEN=10
CMD java -jar bot.jar -t ${TOKEN} CMD java -jar bot.jar -t ${TOKEN}
LABEL org.opencontainers.image.source=https://github.com/Sebclem/ClaptrapBot/ LABEL org.opencontainers.image.source=https://github.com/Sebclem/ClaptrapBot/

View File

@ -15,21 +15,8 @@ version = "$versionObj"
sourceCompatibility = '17' sourceCompatibility = '17'
jar.doFirst {
delete "${buildDir}/libs/*"
}
jar {
// delete "${buildDir}/libs/*"
// baseName = 'DiscordBot'
}
repositories { repositories {
mavenCentral() mavenCentral()
jcenter()
maven { maven {
url 'https://m2.dv8tion.net/releases' url 'https://m2.dv8tion.net/releases'
} }