Fixed merged jars and added it to the ci

This commit is contained in:
coolGi
2023-06-02 23:32:12 +09:30
parent 9d9370f2f5
commit d3a06b8597
2 changed files with 18 additions and 10 deletions
+3 -1
View File
@@ -19,15 +19,17 @@ build_1_18_2:
script: script:
# this both runs the unit tests and assembles the code # this both runs the unit tests and assembles the code
- ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/; - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
- ./gradlew mergeJars -PmcVer="1.18.2" --gradle-user-home cache/;
image: eclipse-temurin:17 image: eclipse-temurin:17
artifacts: artifacts:
name: "NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" name: "NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
paths: paths:
- Merged/*.jar
- fabric/build/libs/*.jar - fabric/build/libs/*.jar
- forge/build/libs/*.jar - forge/build/libs/*.jar
- quilt/build/libs/*.jar - quilt/build/libs/*.jar
exclude: exclude:
# TODO: There is a lot of duplicate stuff here, fix it later # TODO: There is a lot of duplicate stuff here, fix it later to be smaller
- fabric/build/libs/*-all.jar - fabric/build/libs/*-all.jar
- fabric/build/libs/*-sources.jar - fabric/build/libs/*-sources.jar
- forge/build/libs/*-all.jar - forge/build/libs/*-all.jar
+15 -9
View File
@@ -78,17 +78,23 @@ rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_v
forgix { forgix {
group = "com.seibel.lod" group = "com.seibel.lod"
mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar"
forge {
jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
}
fabric { if (findProject(":forge"))
jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar" forge {
} jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
}
removeDuplicate "com.seibel.lod.api" findProject(":fabric")
removeDuplicate "com.seibel.lod.core" fabric {
jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
}
findProject(":quilt")
quilt {
jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar"
}
removeDuplicate "com.seibel.lod"
} }
subprojects { p -> subprojects { p ->