Skip to content

Commit 11cb479

Browse files
committed
build: rebase on 0.3.0
1 parent 729d9d3 commit 11cb479

9 files changed

Lines changed: 136 additions & 217 deletions

File tree

.github/workflows/build.yml

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,61 @@
11
name: build
2-
on: [pull_request, push]
2+
3+
on:
4+
push: {}
5+
pull_request: {}
6+
7+
permissions:
8+
packages: read
39

410
jobs:
511
build:
6-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
713
steps:
8-
- name: checkout repository
9-
uses: actions/checkout@v4
14+
- uses: actions/checkout@v7
1015
with:
11-
submodules: recursive
1216
fetch-depth: 0
13-
- name: setup jdk 25
14-
uses: actions/setup-java@v4
17+
submodules: true
18+
19+
- name: Set up JDK 25
20+
uses: actions/setup-java@v5
1521
with:
22+
distribution: 'zulu'
1623
java-version: 25
17-
distribution: 'microsoft'
24+
java-package: jdk
25+
1826
- name: setup project
1927
run: |
2028
git config --global user.email "no-reply@github.com"
2129
git config --global user.name "Github Actions"
2230
./build.sh up
2331
./build.sh patch
24-
- name: build
32+
33+
- name: Setup Gradle
34+
uses: gradle/actions/setup-gradle@v6
35+
with:
36+
cache-read-only: false
37+
cache-cleanup: never
38+
cache-provider: basic
39+
40+
- name: Build
2541
run: |
2642
cd ScalableLux-Patched
27-
./gradlew clean build
28-
- name: capture build artifacts
29-
uses: actions/upload-artifact@v4
43+
./gradlew clean build --stacktrace
44+
45+
- name: upload to modrinth and curseforge
46+
run: |
47+
cd ScalableLux-Patched
48+
./gradlew publishMods
49+
if: github.ref == 'refs/heads/ports/neoforge/26.2.0'
50+
env:
51+
MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
52+
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}
53+
GITHUB_EVENT_RAW_PATH: ${{ github.event_path }}
54+
continue-on-error: true
55+
56+
- name: Upload Artifact
57+
uses: actions/upload-artifact@v7
3058
with:
3159
name: Artifacts
32-
path: |
33-
**/build/libs/
60+
path: 'build/libs/*.jar'
3461

ScalableLux

Submodule ScalableLux updated 37 files

current-upstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
tag-2ddb365dccef8a9f59d85fb40a83cc59325d334f
1+
tag-46543445a81a474f4a81426205a37db4ab203f17
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: ishland <ishlandmc@yeah.net>
3+
Date: Tue, 31 Dec 2024 14:09:26 +0800
4+
Subject: [PATCH] Buildscript setup
5+
6+
7+
diff --git a/build.gradle b/build.gradle
8+
index 1f784b0..caadbcb 100644
9+
--- a/build.gradle
10+
+++ b/build.gradle
11+
@@ -21,7 +21,7 @@ loom.runs.all {
12+
def getGitCommit = { ->
13+
def stdout = providers.exec {
14+
commandLine 'git', 'rev-parse', '--short', 'HEAD'
15+
-// workingDir = ".."
16+
+ workingDir = ".."
17+
}.standardOutput.asText.get().trim()
18+
return stdout
19+
}
20+
diff --git a/settings.gradle b/settings.gradle
21+
index 59b33fb..72ebf6e 100644
22+
--- a/settings.gradle
23+
+++ b/settings.gradle
24+
@@ -11,7 +11,7 @@ pluginManagement {
25+
26+
rootProject.name = "ScalableLux"
27+
28+
-includeBuild('FlowSched') {
29+
+includeBuild('../FlowSched') {
30+
dependencySubstitution {
31+
substitute module('com.ishland.flowsched:flowsched') using project(':')
32+
}

patches/main/0001-Revert-feat-hardforking.patch

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)