Skip to content

Commit 0f5c944

Browse files
committed
Update buildscript
1 parent 5df114d commit 0f5c944

17 files changed

Lines changed: 995 additions & 283 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,26 @@ jobs:
1212
runs-on: ubuntu-latest
1313
env:
1414
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
15-
CURSEFORGE_PROJECT_ID: ${{ secrets.CURSEFORGE_PROJECT_ID }}
1615
steps:
1716
- name: Checkout
1817
uses: actions/checkout@v4
1918

20-
- name: Set up JDK 8
19+
- name: Set up JDK 25
2120
uses: actions/setup-java@v4
2221
with:
2322
distribution: temurin
24-
java-version: '8'
23+
java-version: '25-ea'
2524

26-
- name: Cache Gradle and Forge/MCP
25+
- name: Cache Gradle and RFG
2726
uses: actions/cache@v4
2827
with:
2928
path: |
3029
~/.gradle/caches
3130
~/.gradle/wrapper
32-
key: gradle-${{ runner.os }}-fg2_3-forge-1_12_2-14_23_5_2847-${{ hashFiles('**/*.gradle*', 'gradle/wrapper/gradle-wrapper.properties') }}
31+
~/.gradle/jdks
32+
key: gradle-${{ runner.os }}-rfg-1_12_2-${{ hashFiles('**/*.gradle*', 'gradle/wrapper/gradle-wrapper.properties') }}
3333
restore-keys: |
34-
gradle-${{ runner.os }}-fg2_3-forge-1_12_2-14_23_5_2847-
34+
gradle-${{ runner.os }}-rfg-1_12_2-
3535
3636
- name: Make gradlew executable
3737
run: chmod +x gradlew
@@ -40,10 +40,9 @@ jobs:
4040
run: chmod +x .github/scripts/*.sh
4141

4242
- name: Build
43-
working-directory: .
4443
run: |
4544
./gradlew --version
46-
./gradlew setupCiWorkspace --info
45+
./gradlew setupDecompWorkspace --info
4746
./gradlew build --info
4847
4948
- name: Upload artifact
@@ -59,7 +58,7 @@ jobs:
5958
run: |
6059
TAG="${GITHUB_REF##*/}"
6160
TAG_COMMIT=$(git rev-list -n 1 "$TAG")
62-
NOTES_FILE="/tmp/release_notes.md"
61+
NOTES_FILE="/tmp/release_notes.md"
6362
.github/scripts/build_release_notes.sh "$TAG" "${GITHUB_REPOSITORY%/*}" "${GITHUB_REPOSITORY#*/}" "$TAG_COMMIT" "${GITHUB_SERVER_URL:-https://github.com}" > "$NOTES_FILE"
6463
echo "Generated release notes:" >&2
6564
sed 's/^/ /' "$NOTES_FILE" >&2
@@ -73,12 +72,11 @@ jobs:
7372
working-directory: .
7473
env:
7574
CURSEFORGE_TOKEN: ${{ env.CURSEFORGE_TOKEN }}
76-
CURSEFORGE_PROJECT_ID: ${{ env.CURSEFORGE_PROJECT_ID }}
7775
GIT_TAG: ${{ github.ref_name }}
78-
CHANGELOG: ${{ github.event.head_commit.message }}
7976
run: |
8077
set -euo pipefail
8178
TAG="${GIT_TAG:-${GITHUB_REF##*/}}"
79+
VERSION_DISPLAY=$(echo "$TAG" | sed -E 's/^v//')
8280
LOWER=$(echo "$TAG" | tr '[:upper:]' '[:lower:]')
8381
RELEASE_TYPE=release
8482
if [[ "$LOWER" == *alpha* ]]; then
@@ -96,6 +94,7 @@ jobs:
9694
TAG_COMMIT=$(git rev-list -n 1 "$TAG")
9795
CL=$(.github/scripts/build_release_notes.sh "$TAG" "${GITHUB_REPOSITORY%/*}" "${GITHUB_REPOSITORY#*/}" "$TAG_COMMIT" "${GITHUB_SERVER_URL:-https://github.com}")
9896
./gradlew curseforge --no-daemon \
99-
-PcurseforgeProjectId="$CURSEFORGE_PROJECT_ID" \
100-
-PcurseforgeChangelog="$CL" \
101-
-PcurseforgeReleaseType="$RELEASE_TYPE"
97+
-Ppublish_to_curseforge=true \
98+
-Prelease_type="$RELEASE_TYPE" \
99+
-Pcurseforge_changelog="$CL" \
100+
-Pcurseforge_display_name="Cell Terminal $VERSION_DISPLAY"

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ build/
99
out/
1010
bin/
1111

12-
# Gradle Wrapper - keep the wrapper jar
13-
!gradle/wrapper/gradle-wrapper.jar
14-
15-
# ForgeGradle
12+
# ForgeGradle / RetroFuturaGradle
1613
run/
1714
logs/
1815
crash-reports/
1916

17+
# RFG auto-generated Tags class (built from tags.properties)
18+
src/main/java/com/cellterminal/Tags.java
19+
2020
# Eclipse
2121
.classpath
2222
.project

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Run:
3939
```
4040
./gradlew -q build
4141
```
42-
Resulting jar will be under `build/libs/`.
42+
First build may take some time. Resulting jar will be under `build/libs/`.
4343

4444
## License
4545
This project is licensed under the MIT License - see the LICENSE file for details.

0 commit comments

Comments
 (0)