Enable back 1.14.x on publish ci as well

Legacy-Fabric · Sep 28, 2024 · 9c25601 · 9c25601
1 parent 2949cdb
commit 9c25601
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 48 deletions.
diff --git 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
@@ -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 }}