Update github workflow to use the new ci script

Legacy-Fabric · Aug 15, 2024 · fbdae85 · fbdae85
1 parent b186761
commit fbdae85
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,6 +32,4 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: python ./yarn.py $MC_VERSION build javadocJar checkMappings mapNamedJar --stacktrace
-      - run: python ./yarn.py $MC_VERSION publishToMavenLocal --stacktrace
-      - run: cd test-mod && ./gradlew build genSources
+      - run: python -u ./ci.py $MC_VERSION buildPublishToLocalAndTest
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,31 +11,27 @@ jobs:
     strategy:
       matrix: 
         mc_version: [
-          #'1.3','1.3.1','1.3.2',
+          #'1.3,1.3.1,1.3.2',
 
-          #'1.4','1.4.1','1.4.2','1.4.3','1.4.4','1.4.5','1.4.6','1.4.7',
+          #'1.4,1.4.1,1.4.2,1.4.3,1.4.4,1.4.5,1.4.6,1.4.7',
 
-          #'1.5','1.5.1','1.5.2',
+          #'1.5,1.5.1,1.5.2',
 
-          '1.6','1.6.1','1.6.2','1.6.3','1.6.4',
+          '1.6,1.6.1,1.6.2,1.6.3,1.6.4',
 
-          '1.7','1.7.1','1.7.2','1.7.3','1.7.4','1.7.5','1.7.6-pre1','1.7.6-pre2','1.7.6',
-          '1.7.7','1.7.8','1.7.10-pre1','1.7.10-pre2','1.7.10-pre3','1.7.10-pre4','1.7.10',
+          '1.7,1.7.1,1.7.2,1.7.3,1.7.4,1.7.5,1.7.6-pre1,1.7.6-pre2,1.7.6',
+          '1.7.7,1.7.8,1.7.10-pre1,1.7.10-pre2,1.7.10-pre3,1.7.10-pre4,1.7.10',
 
-          '1.8.1-pre1','1.8.1-pre2','1.8.1-pre3','1.8.1-pre4','1.8.1-pre5',
-          '1.8.2-pre1','1.8.2-pre2','1.8.2-pre3','1.8.2-pre4','1.8.2-pre5','1.8.2-pre6','1.8.2-pre7',
-          '1.8','1.8.1','1.8.2','1.8.3','1.8.4','1.8.5','1.8.6','1.8.7','1.8.8','1.8.9',
+          '1.8.1-pre1,1.8.1-pre2,1.8.1-pre3,1.8.1-pre4,1.8.1-pre5',
+          '1.8.2-pre1,1.8.2-pre2,1.8.2-pre3,1.8.2-pre4,1.8.2-pre5,1.8.2-pre6,1.8.2-pre7',
+          '1.8,1.8.1,1.8.2,1.8.3,1.8.4,1.8.5,1.8.6,1.8.7,1.8.8,1.8.9',
 
-          '1.9.4',
-          '1.10.2',
-          '1.11.2',
-          '1.12.2',
-          '1.13.2',
+          '1.9.4,1.10.2,1.11.2,1.12.2,1.13.2',
 
-          #'13w11a','13w47a','13w47b','13w47c','13w47d','13w47e','13w48a','13w48b','13w49a',
+          #'13w11a,13w47a,13w47b,13w47c,13w47d,13w47e,13w48a,13w48b,13w49a',
           #'15w14a',
 
-          #'2point0_blue','2point0_purple','2point0_red'
+          #'2point0_blue,2point0_purple,2point0_red'
         ]
     env: 
         MC_VERSION: ${{ matrix.mc_version }}
@@ -48,27 +44,18 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: python ./yarn.py $MC_VERSION publishToMavenLocal --stacktrace
-      - run: cd test-mod && ./gradlew build genSources
+      - run: python -u ./ci.py "$MC_VERSION" publishToLocalAndTest
 
   publish:
     needs: build
     runs-on: ubuntu-latest
     strategy:
       matrix: 
         mc_version: [
-          '1.3.2',
-          '1.4.7',
-          '1.5.2',
-          '1.6.4',
-          '1.7.10',
-          '1.8',
-          '1.8.9',
-          '1.9.4',
-          '1.10.2',
-          '1.11.2',
-          '1.12.2',
-          '1.13.2',
+          '1.3.2,1.4.7,1.5.2',
+          '1.6.4,1.7.10,1.8',
+          '1.8.9,1.9.4,1.10.2',
+          '1.11.2,1.12.2,1.13.2',
         ]
     env: 
         MC_VERSION: ${{ matrix.mc_version }}
@@ -81,6 +68,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: python ./yarn.py $MC_VERSION publish --stacktrace
+      - run: python -u ./ci.py "$MC_VERSION" publish
         env:
           MAVEN_PUBLISH_CREDENTIALS: ${{ secrets.MAVEN_PUBLISH_CREDENTIALS }}
diff --git a/.github/workflows/publish_others.yml b/.github/workflows/publish_others.yml
@@ -9,25 +9,25 @@ jobs:
     strategy:
       matrix: 
         mc_version: [
-          '1.3','1.3.1',
+          '1.3,1.3.1',
 
-          '1.4','1.4.1','1.4.2','1.4.3','1.4.4','1.4.5','1.4.6',
+          '1.4,1.4.1,1.4.2,1.4.3,1.4.4,1.4.5,1.4.6',
 
-          '1.5','1.5.1',
+          '1.5,1.5.1',
 
-          '1.6','1.6.1','1.6.2','1.6.3',
+          '1.6,1.6.1,1.6.2,1.6.3',
 
-          '1.7','1.7.1','1.7.2','1.7.3','1.7.4','1.7.5','1.7.6-pre1','1.7.6-pre2','1.7.6',
-          '1.7.7','1.7.8','1.7.10-pre1','1.7.10-pre2','1.7.10-pre3','1.7.10-pre4',
+          '1.7,1.7.1,1.7.2,1.7.3,1.7.4,1.7.5,1.7.6-pre1,1.7.6-pre2,1.7.6',
+          '1.7.7,1.7.8,1.7.10-pre1,1.7.10-pre2,1.7.10-pre3,1.7.10-pre4',
 
-          '1.8.1-pre1','1.8.1-pre2','1.8.1-pre3','1.8.1-pre4','1.8.1-pre5',
-          '1.8.2-pre1','1.8.2-pre2','1.8.2-pre3','1.8.2-pre4','1.8.2-pre5','1.8.2-pre6','1.8.2-pre7',
-          '1.8.1','1.8.2','1.8.3','1.8.4','1.8.5','1.8.6','1.8.7','1.8.8' #,
+          '1.8.1-pre1,1.8.1-pre2,1.8.1-pre3,1.8.1-pre4,1.8.1-pre5',
+          '1.8.2-pre1,1.8.2-pre2,1.8.2-pre3,1.8.2-pre4,1.8.2-pre5,1.8.2-pre6,1.8.2-pre7',
+          '1.8.1,1.8.2,1.8.3,1.8.4,1.8.5,1.8.6,1.8.7,1.8.8',
 
-          #'13w11a','13w47a','13w47b','13w47c','13w47d','13w47e','13w48a','13w48b','13w49a',
+          #'13w11a,13w47a,13w47b,13w47c,13w47d,13w47e,13w48a,13w48b,13w49a',
           #'15w14a',
 
-          #'2point0_blue','2point0_purple','2point0_red'
+          #'2point0_blue,2point0_purple,2point0_red'
         ]
     env: 
         MC_VERSION: ${{ matrix.mc_version }}
@@ -40,6 +40,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-      - run: python ./yarn.py $MC_VERSION publish --stacktrace
+      - run: python -u ./ci.py "$MC_VERSION" publish
         env:
           MAVEN_PUBLISH_CREDENTIALS: ${{ secrets.MAVEN_PUBLISH_CREDENTIALS }}