From 3d416aa662a33274986d50569de3d753be648dfa Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 14:20:41 +0200 Subject: [PATCH 1/7] Re-enable 1.14.x in ci --- .github/workflows/build.yml | 2 +- test-mod/build.gradle | 4 ++-- test-mod/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4636074a43..7e74369ece 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: '1.13,1.13.1,1.13.2', # Upstream broken yarns -# '1.14,1.14.1,1.14.2,1.14.3,1.14.4' + '1.14,1.14.1,1.14.2,1.14.3,1.14.4' ] env: MC_VERSION: ${{ matrix.mc_version }} diff --git a/test-mod/build.gradle b/test-mod/build.gradle index 47e298cd81..3c62362390 100644 --- a/test-mod/build.gradle +++ b/test-mod/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version "1.7-SNAPSHOT" - id 'legacy-looming' version "1.7-SNAPSHOT" + id 'fabric-loom' version "1.8-SNAPSHOT" + id 'legacy-looming' version "1.8-SNAPSHOT" id 'maven-publish' } diff --git a/test-mod/gradle/wrapper/gradle-wrapper.properties b/test-mod/gradle/wrapper/gradle-wrapper.properties index a4413138c9..9355b41557 100644 --- a/test-mod/gradle/wrapper/gradle-wrapper.properties +++ b/test-mod/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 56b6ce772d93b6330ea142cd8b98d36851cb1100 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 14:23:54 +0200 Subject: [PATCH 2/7] Fix javadoc lint --- mappings/net/minecraft/world/chunk/WorldChunk.mapping | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index ad2282999c..a45ec07190 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -132,7 +132,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk COMMENT COMMENT Warning: If {@code null} is passed as the entity type filter, care should be COMMENT taken that the type argument {@code T} is set to {@link Entity}, otherwise heap pollution in - COMMENT the output list or {@link ClassCastException} can occur. + COMMENT the output list or {@link ClassCastException} can occur ARG 1 type COMMENT the entity type of the entities to collect, or {@code null} to collect entities of all types. ARG 2 box From 67325ee2ecd894713eea35057fe340563077b84b Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 14:25:55 +0200 Subject: [PATCH 3/7] Fix javadoc lint --- mappings/net/minecraft/world/chunk/WorldChunk.mapping | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index a45ec07190..ded585552c 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -132,9 +132,9 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk COMMENT COMMENT Warning: If {@code null} is passed as the entity type filter, care should be COMMENT taken that the type argument {@code T} is set to {@link Entity}, otherwise heap pollution in - COMMENT the output list or {@link ClassCastException} can occur + COMMENT the output list or {@link ClassCastException} can occur. ARG 1 type - COMMENT the entity type of the entities to collect, or {@code null} to collect entities of all types. + COMMENT the entity type of the entities to collect, or {@code null} to collect entities of all types ARG 2 box COMMENT the box within which collected entities must be ARG 3 result From 6e43ed66925cdfb7bd7000a788d5ec498223a3de Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 14:28:43 +0200 Subject: [PATCH 4/7] Disable 1.14.0 for now --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7e74369ece..5883336ab3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,8 @@ jobs: '1.13,1.13.1,1.13.2', # Upstream broken yarns - '1.14,1.14.1,1.14.2,1.14.3,1.14.4' +# '1.14', + '1.14.1,1.14.2,1.14.3,1.14.4' ] env: MC_VERSION: ${{ matrix.mc_version }} From 2949cdb922c934d0ed122fd56be953ddcb1af5a0 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 14:48:55 +0200 Subject: [PATCH 5/7] Temporary workaround for Loom 1.8 --- ci.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ci.py b/ci.py index 6aabf25e7b..de265d2dd3 100644 --- a/ci.py +++ b/ci.py @@ -18,7 +18,8 @@ def main(): if mainCommand == "publishToLocalAndTest": commandList = [ [GRADLE_PREFIX + " publishToMavenLocal unifyMappings", True], - ["cd test-mod && " + GRADLE_PREFIX + " build genSources", False] + ["cd test-mod && " + GRADLE_PREFIX + " build", False], + ["cd test-mod && " + GRADLE_PREFIX + " genSources", False] ] elif mainCommand == "publish": commandList = [ @@ -28,7 +29,8 @@ def main(): commandList = [ [GRADLE_PREFIX + " build javadocJar checkMappings mapNamedJar unifyMappings", True], [GRADLE_PREFIX + " publishToMavenLocal unifyMappings", True], - ["cd test-mod && " + GRADLE_PREFIX + " build genSources", False] + ["cd test-mod && " + GRADLE_PREFIX + " build", False], + ["cd test-mod && " + GRADLE_PREFIX + " genSources", False] ] failedVersions = [] @@ -37,6 +39,8 @@ def main(): testedVersion = [version for version in versions if version not in failedVersions] print("Running command '" + command[0] + "' for versions " + ", ".join(testedVersion)) + shouldStop = False + for version in testedVersion: print("Running command for version " + version) exitCode = yarn.run_command_with_mcversion(version, command[0]) @@ -44,7 +48,11 @@ def main(): if exitCode != 0: failedVersions.append(version) if command[1]: + shouldStop = True break + + if shouldStop: + break if len(failedVersions) < 1: exit(0) From 9c25601b1a7de0c37a014e2a2e600d6b0093f899 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 15:13:53 +0200 Subject: [PATCH 6/7] Enable back 1.14.x on publish ci as well --- .github/workflows/publish.yml | 73 ++++++++++++++-------------- .github/workflows/publish_others.yml | 25 +++++----- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d329a3ac06..9286c78607 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -78,42 +78,42 @@ jobs: distribution: 'temurin' # See 'Supported distributions' for available options java-version: '17' - run: python -u ./ci.py "$MC_VERSION" publishToLocalAndTest -# upstream_build: -# runs-on: ubuntu-latest -# continue-on-error: true -# strategy: -# matrix: -# mc_version: [ -# # Upstream broken yarns -# "18w43b,18w43c,18w44a,18w45a,18w46a,18w47a,18w47b", -# "18w48a,18w48b,18w49a,18w50a,19w02a,19w03a,19w03b", -# "19w03c,19w04a,19w04b,19w05a,19w06a,19w07a,19w08a", -# "19w08b,19w09a,19w11a,19w11b,19w12a,19w12b,19w13a", -# "19w13b,19w14a,19w14b,3D Shareware v1.34", -# -# "1.14 Pre-Release 1,1.14 Pre-Release 2,1.14 Pre-Release 3,1.14 Pre-Release 4,1.14 Pre-Release 5,1.14.1 Pre-Release 1,1.14.1 Pre-Release 2", -# -# "1.14.2 Pre-Release 1,1.14.2 Pre-Release 2,1.14.2 Pre-Release 3,1.14.2 Pre-Release 4,1.14.3-pre1,1.14.3-pre2,1.14.3-pre3", -# -# "1.14.3-pre4,1.14.4-pre1,1.14.4-pre2,1.14.4-pre3,1.14.4-pre4,1.14.4-pre5,1.14.4-pre6,1.14.4-pre7", -# -## "1.14", -# "1.14.1,1.14.2,1.14.3,1.14.4", -# ] -# env: -# MC_VERSION: ${{ matrix.mc_version }} -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-python@v5 -# with: -# python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax -# - uses: actions/setup-java@v4 -# with: -# distribution: 'temurin' # See 'Supported distributions' for available options -# java-version: '17' -# - run: python -u ./ci.py "$MC_VERSION" publishToLocalAndTest + upstream_build: + runs-on: ubuntu-latest + continue-on-error: true + strategy: + matrix: + mc_version: [ + # Upstream broken yarns + "18w43b,18w43c,18w44a,18w45a,18w46a,18w47a,18w47b", + "18w48a,18w48b,18w49a,18w50a,19w02a,19w03a,19w03b", + "19w03c,19w04a,19w04b,19w05a,19w06a,19w07a,19w08a", + "19w08b,19w09a,19w11a,19w11b,19w12a,19w12b,19w13a", + "19w13b,19w14a,19w14b,3D Shareware v1.34", + + "1.14 Pre-Release 1,1.14 Pre-Release 2,1.14 Pre-Release 3,1.14 Pre-Release 4,1.14 Pre-Release 5,1.14.1 Pre-Release 1,1.14.1 Pre-Release 2", + + "1.14.2 Pre-Release 1,1.14.2 Pre-Release 2,1.14.2 Pre-Release 3,1.14.2 Pre-Release 4,1.14.3-pre1,1.14.3-pre2,1.14.3-pre3", + + "1.14.3-pre4,1.14.4-pre1,1.14.4-pre2,1.14.4-pre3,1.14.4-pre4,1.14.4-pre5,1.14.4-pre6,1.14.4-pre7", + +# "1.14", + "1.14.1,1.14.2,1.14.3,1.14.4", + ] + env: + MC_VERSION: ${{ matrix.mc_version }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + with: + python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax + - uses: actions/setup-java@v4 + with: + distribution: 'temurin' # See 'Supported distributions' for available options + java-version: '17' + - run: python -u ./ci.py "$MC_VERSION" publishToLocalAndTest publish: - needs: [legacy_build] + needs: [legacy_build, upstream_build] runs-on: ubuntu-latest strategy: matrix: @@ -124,7 +124,8 @@ jobs: '1.12,1.12.1,1.12.2,1.13,1.13.1,1.13.2', # Upstream broken yarns -# '1.14,1.14.1,1.14.2,1.14.3,1.14.4' +# '1.14', + '1.14.1,1.14.2,1.14.3,1.14.4' ] env: MC_VERSION: ${{ matrix.mc_version }} diff --git a/.github/workflows/publish_others.yml b/.github/workflows/publish_others.yml index f4aa57ac78..4d854cb7d9 100644 --- a/.github/workflows/publish_others.yml +++ b/.github/workflows/publish_others.yml @@ -9,6 +9,7 @@ on: jobs: publish: runs-on: ubuntu-latest + continue-on-error: true strategy: matrix: mc_version: [ @@ -48,7 +49,7 @@ jobs: "18w03b,18w05a,18w06a,18w07a,18w07b,18w07c,18w08a", "18w08b,18w09a,18w10a,18w10b,18w10c,18w10d,18w11a", "18w14a,18w14b,18w15a,18w16a", -# "18w19a", + "18w19a", "18w19b,18w20a", "18w20b,18w20c,18w21a,18w21b,18w22a,18w22b,18w22c", @@ -57,17 +58,17 @@ jobs: "18w30a,18w30b,18w31a,18w32a,18w33a,18w43a", # Upstream broken yarns -# "18w43b,18w43c,18w44a,18w45a,18w46a,18w47a,18w47b", -# "18w48a,18w48b,18w49a,18w50a,19w02a,19w03a,19w03b", -# "19w03c,19w04a,19w04b,19w05a,19w06a,19w07a,19w08a", -# "19w08b,19w09a,19w11a,19w11b,19w12a,19w12b,19w13a", -# "19w13b,19w14a,19w14b,3D Shareware v1.34", -# -# "1.14 Pre-Release 1,1.14 Pre-Release 2,1.14 Pre-Release 3,1.14 Pre-Release 4,1.14 Pre-Release 5,1.14.1 Pre-Release 1,1.14.1 Pre-Release 2", -# -# "1.14.2 Pre-Release 1,1.14.2 Pre-Release 2,1.14.2 Pre-Release 3,1.14.2 Pre-Release 4,1.14.3-pre1,1.14.3-pre2,1.14.3-pre3", -# -# "1.14.3-pre4,1.14.4-pre1,1.14.4-pre2,1.14.4-pre3,1.14.4-pre4,1.14.4-pre5,1.14.4-pre6,1.14.4-pre7", + "18w43b,18w43c,18w44a,18w45a,18w46a,18w47a,18w47b", + "18w48a,18w48b,18w49a,18w50a,19w02a,19w03a,19w03b", + "19w03c,19w04a,19w04b,19w05a,19w06a,19w07a,19w08a", + "19w08b,19w09a,19w11a,19w11b,19w12a,19w12b,19w13a", + "19w13b,19w14a,19w14b,3D Shareware v1.34", + + "1.14 Pre-Release 1,1.14 Pre-Release 2,1.14 Pre-Release 3,1.14 Pre-Release 4,1.14 Pre-Release 5,1.14.1 Pre-Release 1,1.14.1 Pre-Release 2", + + "1.14.2 Pre-Release 1,1.14.2 Pre-Release 2,1.14.2 Pre-Release 3,1.14.2 Pre-Release 4,1.14.3-pre1,1.14.3-pre2,1.14.3-pre3", + + "1.14.3-pre4,1.14.4-pre1,1.14.4-pre2,1.14.4-pre3,1.14.4-pre4,1.14.4-pre5,1.14.4-pre6,1.14.4-pre7", ] env: MC_VERSION: ${{ matrix.mc_version }} From 1b3104865a73eae73e62345eda110bc32a271ad6 Mon Sep 17 00:00:00 2001 From: Cat Core Date: Sat, 28 Sep 2024 15:14:27 +0200 Subject: [PATCH 7/7] Workaround no longer needed --- ci.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ci.py b/ci.py index de265d2dd3..b9e0bf6b51 100644 --- a/ci.py +++ b/ci.py @@ -18,8 +18,7 @@ def main(): if mainCommand == "publishToLocalAndTest": commandList = [ [GRADLE_PREFIX + " publishToMavenLocal unifyMappings", True], - ["cd test-mod && " + GRADLE_PREFIX + " build", False], - ["cd test-mod && " + GRADLE_PREFIX + " genSources", False] + ["cd test-mod && " + GRADLE_PREFIX + " build genSources", False] ] elif mainCommand == "publish": commandList = [ @@ -29,8 +28,7 @@ def main(): commandList = [ [GRADLE_PREFIX + " build javadocJar checkMappings mapNamedJar unifyMappings", True], [GRADLE_PREFIX + " publishToMavenLocal unifyMappings", True], - ["cd test-mod && " + GRADLE_PREFIX + " build", False], - ["cd test-mod && " + GRADLE_PREFIX + " genSources", False] + ["cd test-mod && " + GRADLE_PREFIX + " build genSources", False] ] failedVersions = []