Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable 1.14.x in ci #282

Merged
merged 7 commits into from
Sep 28, 2024
Merged

Re-enable 1.14.x in ci #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d416aa
Re-enable 1.14.x in ci
thecatcore Sep 28, 2024
56b6ce7
Fix javadoc lint
thecatcore Sep 28, 2024
67325ee
Fix javadoc lint
thecatcore Sep 28, 2024
6e43ed6
Disable 1.14.0 for now
thecatcore Sep 28, 2024
2949cdb
Temporary workaround for Loom 1.8
thecatcore Sep 28, 2024
9c25601
Enable back 1.14.x on publish ci as well
thecatcore Sep 28, 2024
1b31048
Workaround no longer needed
thecatcore Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
73 changes: 37 additions & 36 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/publish_others.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
jobs:
publish:
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
mc_version: [
Expand Down Expand Up @@ -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",

Expand All @@ -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 }}
Expand Down
6 changes: 6 additions & 0 deletions ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,20 @@ 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])

if exitCode != 0:
failedVersions.append(version)
if command[1]:
shouldStop = True
break

if shouldStop:
break

if len(failedVersions) < 1:
exit(0)
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/world/chunk/WorldChunk.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
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.
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
Expand Down
4 changes: 2 additions & 2 deletions test-mod/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion test-mod/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading