Fix build
This commit is contained in:
parent
4118116ee9
commit
35093a1bd1
9
.github/workflows/build.yml
vendored
9
.github/workflows/build.yml
vendored
@ -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
|
||||||
|
@ -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/
|
13
build.gradle
13
build.gradle
@ -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'
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user