Skip to content

Commit 9e9940c

Browse files
committed
new: b6 release
1 parent 2eaee12 commit 9e9940c

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

.github/workflows/build.yml

+23-18
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
1-
name: build
1+
name: Build
22

33
on:
4-
- push
4+
push:
5+
branches: [ legacy ]
6+
pull_request:
7+
branches: [ legacy ]
58

69
jobs:
710
build:
811
runs-on: ubuntu-latest
912
steps:
10-
- name: Checkout repository
11-
uses: actions/checkout@v2
13+
- name: Checkout repository and submodules
14+
uses: actions/checkout@v4
1215
with:
1316
submodules: recursive
14-
- name: Java setup
15-
uses: actions/setup-java@v2
17+
- name: Setup java
18+
uses: actions/setup-java@v4
1619
with:
17-
distribution: "zulu"
20+
distribution: "adopt"
1821
java-version: 8
1922
cache: "gradle"
20-
- name: Set outputs
21-
id: vars
22-
run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
2323
- name: Build
24-
run: chmod +x ./gradlew && ./gradlew setupCiWorkspace && ./gradlew build
25-
- name: Rename build artifacts
26-
run: mv build/libs/FDPClient-*.jar build/libs/FDPClient-build.jar
27-
- name: Upload build artifacts
28-
uses: actions/upload-artifact@v2
29-
with:
30-
name: FDPClient
31-
path: build/libs/FDPClient-build.jar
24+
run: ./gradlew setupCiWorkspace && ./gradlew build
25+
- name: Upload artifact
26+
run: |
27+
cd build/libs
28+
export JAR=$(find . -regex '.*fdpclient-b[0-9|.]*\.jar')
29+
export FDP_VERSION=$(echo $JAR | sed -r 's/.\/fdpclient-([a-zA-Z][0-9]+)\.jar/\1/')
30+
export MINECRAFT_VERSION='1.8.9'
31+
echo Version: $FDP_VERSION, Minecraft: $MINECRAFT_VERSION
32+
cp $JAR zip/fdpclient.jar
33+
cd zip
34+
zip -r fdpclient.zip *
35+
md5sum fdpclient.zip
36+
curl --connect-timeout 30 -m 300 -X POST -F "[email protected]" -H "Authorization: ${{ secrets.NIGHTLY_PASS }}" -F "gh_id=${{ github.event.head_commit.id }}" -F "gh_ref=${{ github.ref }}" -F "gh_message=${{ github.event.head_commit.message }}" -F "gh_timestamp=${{ github.event.head_commit.timestamp }}" -F "fdp_version=$FDP_VERSION" -F "mc_version=$MINECRAFT_VERSION" -F "jre_version=8" -F "subsystem=forge" https://api.liquidbounce.net/api/v1/version/new

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx3g
22

3-
mod_version=b5
3+
mod_version=b6
44
maven_group=net.ccbluex
55
archives_base_name=FDPClient
66

src/main/java/net/ccbluex/liquidbounce/FDPClient.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object FDPClient {
6262
const val CLIENT_AUTHOR = "Zywl 1zuna"
6363
const val CLIENT_CLOUD = "https://cloud.liquidbounce.net/LiquidBounce"
6464
const val CLIENT_WEBSITE = "fdpinfo.github.io"
65-
const val CLIENT_VERSION = "b5"
65+
const val CLIENT_VERSION = "b6"
6666

6767
val clientVersionText = gitInfo["git.build.version"]?.toString() ?: "unknown"
6868
val clientVersionNumber = clientVersionText.substring(1).toIntOrNull() ?: 0 // version format: "b<VERSION>" on legacy
@@ -73,7 +73,7 @@ object FDPClient {
7373
* Defines if the client is in development mode.
7474
* This will enable update checking on commit time instead of regular legacy versioning.
7575
*/
76-
const val IN_DEV = true
76+
const val IN_DEV = false
7777

7878
val clientTitle = CLIENT_NAME + " " + clientVersionText + " " + clientCommit + " | " + if (IN_DEV) " | DEVELOPMENT BUILD" else ""
7979

0 commit comments

Comments
 (0)