Skip to content

Commit dc052ac

Browse files
committed
Merge remote-tracking branch 'origin/master-26-lts' into master-26
2 parents 4bd54cb + ac30739 commit dc052ac

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111

1212
jobs:
1313
build:
14-
name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }} on ${{ matrix.os }}
14+
name: Build for Java ${{ matrix.java }} on ${{ matrix.distribution }}
1515
runs-on: ubuntu-latest
1616
strategy:
1717
fail-fast: false
@@ -37,13 +37,15 @@ jobs:
3737
uses: actions/checkout@v4
3838
with:
3939
submodules: true
40-
- name: Start VM
41-
if: matrix.os == 'openbsd'
42-
uses: cross-platform-actions/action@v1.3.0
40+
- name: Install GraalVM
41+
if: matrix.distribution == 'graalvm'
42+
uses: graalvm/setup-graalvm@v1
4343
with:
44-
operating_system: freebsd
45-
version: '15.1'
44+
distribution: 'graalvm-community'
45+
version: '25.1'
46+
github-token: ${{ secrets.GITHUB_TOKEN }}
4647
- name: 'Setup Java'
48+
if: matrix.distribution != 'graalvm'
4749
uses: actions/setup-java@v4
4850
with:
4951
distribution: ${{ matrix.distribution }}

‎src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public class IntegratedScripting extends ModBaseNeoForge<IntegratedScripting> {
6666

6767
public IntegratedScripting(IEventBus modEventBus) {
6868
super(Reference.MOD_ID, (instance) -> _instance = instance, modEventBus);
69-
System.out.println("RUNNING ON OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version") + " " + System.getProperty("os.arch"));
7069

7170
try {
7271
PackagedDependenciesLoader.load();

0 commit comments

Comments
 (0)