File tree Expand file tree Collapse file tree 11 files changed +78
-59
lines changed Expand file tree Collapse file tree 11 files changed +78
-59
lines changed Original file line number Diff line number Diff line change 1+ * text eol =lf
Original file line number Diff line number Diff line change 1+ version : 2
2+ updates :
3+ - package-ecosystem : " gradle"
4+ directory : " /"
5+ schedule :
6+ interval : " weekly"
Original file line number Diff line number Diff line change 1+ [ contributing ] : https://github.com/Together-Java/TJ-Bot/wiki/Contributing
2+ [ code_guidelines ] : https://github.com/Together-Java/TJ-Bot/wiki/Code-Guidelines
3+ [ new_issue ] : https://github.com/Together-Java/TJ-Bot/issues/new/choose
4+
5+ ## Pull-request
6+
7+ - [ ] I have read the [ contributing guidelines] [ contributing ] .
8+ - [ ] I have read the [ code guidelines] [ code_guidelines ] .
9+ - [ ] I have created a relating [ issue] [ new_issue ] .
10+
11+ ### Changes
12+
13+ - [ ] Existing code
14+ - [ ] New feature
15+
16+ <!--
17+ While an issue isn't required, this is preferred for most changes.
18+ It helps make it maintainable for us, and will save you from possibly recoding everything :p
19+ If there's no relating issue, keep it NaN
20+ -->
21+
22+ Closes Issue: NaN
23+
24+ ## Description
25+
26+ Replace this sentence with general description of what your Pull Request does.
Original file line number Diff line number Diff line change @@ -2,33 +2,28 @@ name: Docker Publish
22
33on :
44 push :
5- branches :
6- - ' master'
7- - ' feature/cicd-workflows'
8-
9- env :
10- JAVA_VERSION : 19
5+ branches : [ master ]
6+ workflow_dispatch :
117
128jobs :
139 docker :
1410 runs-on : ubuntu-latest
1511 steps :
16- - name : Set up JDK
17- uses : actions/setup-java@v1
18- with :
19- java-version : ${{ env.JAVA_VERSION }}
20- - name : Extract branch name
21- shell : bash
22- run : echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
23- id : extract_branch
24- - uses : actions/checkout@v2
12+ - name : Check out code
13+ uses : actions/checkout@v4
14+
15+ - name : Install Java
16+ uses : actions/setup-java@v3
2517 with :
26- fetch-depth : 0
27- - name : Build and Publish Docker Image
18+ java-version : ' 21'
19+ distribution : ' corretto'
20+
21+ - name : Build Docker image and publish
2822 env :
2923 ORG_REGISTRY_USER : ${{ secrets.ORG_REGISTRY_USER }}
3024 ORG_REGISTRY_PASSWORD : ${{ secrets.ORG_REGISTRY_PASSWORD }}
31- BRANCH_NAME : ${{ steps.extract_branch.outputs.branch }}
25+ BRANCH_NAME : ${{ github.ref_name }}
3226 run : ./gradlew jib
33- - name : Re-Deploy
27+
28+ - name : Trigger deployment
3429 run : " curl -H 'Authorization: Bearer ${{ secrets.ORG_WATCHTOWER_TOKEN }}' https://togetherjava.org:5003/v1/update"
Original file line number Diff line number Diff line change 11name : Docker Verify
2-
3- on : [pull_request]
4-
5- env :
6- JAVA_VERSION : 19
2+ on :
3+ pull_request :
4+ workflow_dispatch :
75
86jobs :
97 docker :
108 name : Docker Verify
119 runs-on : ubuntu-latest
1210 steps :
13- - name : Set up JDK
14- uses : actions/setup-java@v1
15- with :
16- java-version : ${{ env.JAVA_VERSION }}
17- - uses : actions/checkout@v2
11+ - name : Check out code
12+ uses : actions/checkout@v4
13+
14+ - name : Install Java
15+ uses : actions/setup-java@v3
1816 with :
19- fetch-depth : 0
20- - name : Docker Verify
17+ java-version : 21
18+ distribution : ' corretto'
19+
20+ - name : Build Docker image
2121 run : ./gradlew jibDockerBuild
Original file line number Diff line number Diff line change @@ -9,28 +9,27 @@ defaults:
99 run :
1010 shell : bash
1111
12- env :
13- JAVA_VERSION : 19
14-
1512jobs :
1613
1714 release :
1815 name : Build and release
1916 runs-on : ubuntu-latest
2017 steps :
21- - name : Set up JDK
22- uses : actions/setup-java@v1
23- with :
24- java-version : ${{ env.JAVA_VERSION }}
18+ - name : Check out code
19+ uses : actions/checkout@v4
2520
26- - uses : actions/checkout@v2
21+ - name : Install Java
22+ uses : actions/setup-java@v3
23+ with :
24+ java-version : 21
25+ distribution : ' corretto'
2726
28- - name : Build shadow jar
27+ - name : Generate FAT Jar
2928 run : ./gradlew shadowJar
3029
3130 - name : Create release
32- uses : softprops/action-gh-release@v1
31+ uses : softprops/action-gh-release@v2
3332 env :
3433 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
3534 with :
36- files : app/build/libs/TJ-Plays .jar
35+ files : app/build/libs/TJ-JShell-Backend .jar
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -11,12 +11,6 @@ plugins {
1111group ' org.togetherjava'
1212version ' 1.0-SNAPSHOT'
1313
14- java {
15- toolchain {
16- languageVersion = JavaLanguageVersion . of(19 )
17- }
18- }
19-
2014repositories {
2115 mavenCentral()
2216}
@@ -34,7 +28,7 @@ dependencies {
3428var outputImage = ' togetherjava.org:5001/togetherjava/jshellbackend:master' ?: ' latest'
3529
3630jib {
37- from. image = ' eclipse-temurin:19 '
31+ from. image = ' eclipse-temurin:21 '
3832 to {
3933 image = outputImage
4034 auth {
Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ group 'org.togetherjava'
88version ' 1.0-SNAPSHOT'
99
1010mainClassName = ' Main' // Debugging only
11- sourceCompatibility = 19
1211
1312run { // Debugging only
1413 standardInput = System . in
Original file line number Diff line number Diff line change 11distributionBase =GRADLE_USER_HOME
22distributionPath =wrapper/dists
3- distributionUrl =https\://services.gradle.org/distributions/gradle-8.3 -bin.zip
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.7 -bin.zip
44networkTimeout =10000
55validateDistributionUrl =true
66zipStoreBase =GRADLE_USER_HOME
You can’t perform that action at this time.
0 commit comments