From c883ded7c433626de7b5ad8a43b27c7166f3446d Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:39:21 +0500 Subject: [PATCH 1/6] Artifacts in zip root --- .gitlab-ci.yml | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06deaa984..4ec375a5d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,28 +41,18 @@ build: - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; + - cp ./fabric/build/libs/* . + - cp ./forge/build/libs/* . + - cp ./neoforge/build/libs/* . + - cp ./Merged/* . artifacts: name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: - - Merged/*.jar - - quilt/build/libs/*.jar - - fabric/build/libs/*.jar - - forge/build/libs/*.jar - - neoforge/build/libs/*.jar + - ./*.jar exclude: - # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller - - fabric/build/libs/*-all.jar - - fabric/build/libs/*-dev.jar - - fabric/build/libs/*-sources.jar - - quilt/build/libs/*-all.jar - - quilt/build/libs/*-dev.jar - - quilt/build/libs/*-sources.jar - - forge/build/libs/*-all.jar - - forge/build/libs/*-dev.jar - - forge/build/libs/*-sources.jar - - neoforge/build/libs/*-all.jar - - neoforge/build/libs/*-dev.jar - - neoforge/build/libs/*-sources.jar + - ./*-all.jar + - ./*-dev.jar + - ./*-sources.jar expire_in: 14 days when: always extends: .build_java @@ -77,15 +67,15 @@ api: # this also runs unit tests - ./gradlew api:build --gradle-user-home cache/; - ./gradlew api:addSourcesToCompiledJar --gradle-user-home cache/; + - cp ./coreSubProjects/api/build/libs/merged/* . artifacts: - name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" + name: "NightlyBuild_Api-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: - - coreSubProjects/api/build/libs/merged/*.jar - # can be uncommented if we don't want a jar with the source code - # - coreSubProjects/api/build/libs/*.jar + - ./*.jar exclude: - - coreSubProjects/api/build/libs/merged/*-all.jar - - coreSubProjects/api/build/libs/merged/*-sources.jar + - ./*-all.jar + - ./*-dev.jar + - ./*-sources.jar expire_in: 1 day when: always extends: .build_java From 96f2f8c3b2227656dc27652ce10c45907eedbb76 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:48:17 +0500 Subject: [PATCH 2/6] Artifacts in zip root 2 --- .gitlab-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ec375a5d..45b6e95a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,10 +41,12 @@ build: - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - - cp ./fabric/build/libs/* . - - cp ./forge/build/libs/* . - - cp ./neoforge/build/libs/* . - - cp ./Merged/* . + - cp \ + ./fabric/build/libs/* \ + ./forge/build/libs/* \ + ./neoforge/build/libs/* \ + ./Merged/* \ + . artifacts: name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: From 595cdf011a6e26521583ef3ca062df06d8c97b2d Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 20:56:44 +0500 Subject: [PATCH 3/6] Artifacts in zip root 3 --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45b6e95a0..71fa2853f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,12 +41,7 @@ build: - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - - cp \ - ./fabric/build/libs/* \ - ./forge/build/libs/* \ - ./neoforge/build/libs/* \ - ./Merged/* \ - . + - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./Merged/* . artifacts: name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: From d40f4dfe19a8911cbcb7601402616f654073a406 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:01:30 +0500 Subject: [PATCH 4/6] Artifacts in zip root 4 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71fa2853f..4c7d6254a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ build: - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/; - - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./Merged/* . + - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./Merged/* . || true artifacts: name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}" paths: From 8287192cd0ebe8fabdd01c9ab6387350e715e9ec Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:15:01 +0500 Subject: [PATCH 5/6] More consistent names --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4113e60fb..f2136f860 100644 --- a/build.gradle +++ b/build.gradle @@ -74,23 +74,23 @@ forgix { if (findProject(":forge")) forge { - jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar" + jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-forge.jar" } if (findProject(":neoforge")) custom { projectName = "neoforge" - jarLocation = "build/libs/DistantHorizons-neoforge-${rootProject.versionStr}.jar" + jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-neoforge.jar" } if (findProject(":fabric")) fabric { - jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar" + jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-fabric.jar" } if (findProject(":quilt")) quilt { - jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar" + jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-quilt.jar" } removeDuplicate "com.seibel.distanthorizons" From e070bf4244fcaecc0d7937e784920ccfc26b2a74 Mon Sep 17 00:00:00 2001 From: s809 <43530948+s809@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:25:58 +0500 Subject: [PATCH 6/6] More consistent names but reverse --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f2136f860..7b9d20cc5 100644 --- a/build.gradle +++ b/build.gradle @@ -70,27 +70,27 @@ forgix { String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-"); group = "com.seibel.distanthorizons" - mergedJarName = "DistantHorizons-${rootProject.versionStr}-${loaderHyphenSeparatedList}.jar" + mergedJarName = "DistantHorizons-${loaderHyphenSeparatedList}-${rootProject.versionStr}.jar" if (findProject(":forge")) forge { - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-forge.jar" + jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar" } if (findProject(":neoforge")) custom { projectName = "neoforge" - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-neoforge.jar" + jarLocation = "build/libs/DistantHorizons-neoforge-${rootProject.versionStr}.jar" } if (findProject(":fabric")) fabric { - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-fabric.jar" + jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar" } if (findProject(":quilt")) quilt { - jarLocation = "build/libs/DistantHorizons-${rootProject.versionStr}-quilt.jar" + jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar" } removeDuplicate "com.seibel.distanthorizons"