Skip to content

Commit

Permalink
no way ci fixed (#19)
Browse files Browse the repository at this point in the history
this took way too long
  • Loading branch information
rhysdh540 committed Feb 10, 2024
1 parent 55fdbc3 commit 151f7f6
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ on: [ workflow_dispatch, push, pull_request ]

jobs:
build:
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: setup java
uses: actions/setup-java@v4
with:
distribution: temurin
distribution: zulu
java-version: 17

- name: setup gradle
Expand All @@ -20,10 +20,10 @@ jobs:
cache-read-only: false

- name: do the build
run: ./gradlew clean assemble
run: .\gradlew.bat clean assemble

- name: Upload artifacts
uses: actions/upload-artifact@v3
- name: upload artifacts
uses: actions/upload-artifact@v4
with:
name: unlimited-artifacts
path: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
build/
!**/src/**/build/
**/run/
*.iml
.gradle/
.idea/
build.properties
.DS_Store
artifacts/
.architectury-transformer/
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@ allprojects {
tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
options.release.set(17)
options.compilerArgs += ['-Xplugin:Manifold']
options.compilerArgs += ['-Xplugin:Manifold', '-implicit:none']
}
}

architectury {
minecraft = minecraft_version
compileOnly()
}

clean { delete '.architectury-transformer' }
Expand Down Expand Up @@ -73,6 +72,7 @@ def setup() {
defineMixins()

tasks.register('nukeGradleCaches') {
dependsOn clean
group = 'build'
doLast {
allprojects.each {
Expand All @@ -84,9 +84,11 @@ def setup() {

def setupForgixAndMachete() {
forgix {
group = project.group
group = rootProject.maven_group
mergedJarName = "createunlimited-${modVersion}.jar"
outputDir = 'build/libs/merged'

removeDuplicate('com.llamalad7.mixinextras')
}

machete {
Expand Down
8 changes: 0 additions & 8 deletions build.properties

This file was deleted.

2 changes: 2 additions & 0 deletions gradle/platform.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ shadowJar {

configurations = [project.configurations.shadowCommon, project.configurations.shade]
archiveClassifier = "shadow-${project.name}"

relocate('com.github.llamalad7.mixinextras', 'dev.rdh.createunlimited.shadow.mixinextras')
}

remapJar {
Expand Down
92 changes: 92 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pluginManagement {
repositories {
mavenLocal()
maven { url 'https://maven.fabricmc.net/' }
maven { url 'https://maven.architectury.dev/' }
maven { url 'https://maven.minecraftforge.net/' }
Expand Down

0 comments on commit 151f7f6

Please sign in to comment.