💚 update CI

kitUIN · Aug 4, 2024 · a7350a6 · a7350a6
1 parent 0c71400
commit a7350a6
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         id: set-matrix
         shell: pwsh
         run: |
-          .\matrix.ps1 -path "."
+          .\matrix.ps1 -path "fabric","forge","neoforge"
 
   test:
     runs-on: windows-latest
@@ -43,7 +43,7 @@ jobs:
           ./init.ps1
       - name: Build
         run: |
-          cd ${{ matrix.mc-loader }}/${{ matrix.mc-loader }}-${{ matrix.mc-version }}
+          cd ${{ matrix.config.mc-loader }}/${{ matrix.config.mc-loader }}-${{ matrix.config.mc-version }}
           ./gradlew clean build
           cd ../..
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build_fabric.yml b/.github/workflows/build_fabric.yml
@@ -49,6 +49,6 @@ jobs:
           ./init.ps1
       - name: Build
         run: |
-          cd ${{ matrix.mc-loader }}/${{ matrix.mc-loader }}-${{ matrix.mc-version }}
+          cd ${{ matrix.config.mc-loader }}/${{ matrix.config.mc-loader }}-${{ matrix.config.mc-version }}
           ./gradlew clean build
           cd ../..
diff --git a/.github/workflows/build_forge.yml b/.github/workflows/build_forge.yml
@@ -49,6 +49,6 @@ jobs:
           ./init.ps1
       - name: Build
         run: |
-          cd ${{ matrix.mc-loader }}/${{ matrix.mc-loader }}-${{ matrix.mc-version }}
+          cd ${{ matrix.config.mc-loader }}/${{ matrix.config.mc-loader }}-${{ matrix.config.mc-version }}
           ./gradlew clean build
           cd ../..
diff --git a/.github/workflows/build_neoforge.yml b/.github/workflows/build_neoforge.yml
@@ -49,6 +49,6 @@ jobs:
           ./init.ps1
       - name: Build
         run: |
-          cd ${{ matrix.mc-loader }}/${{ matrix.mc-loader }}-${{ matrix.mc-version }}
+          cd ${{ matrix.config.mc-loader }}/${{ matrix.config.mc-loader }}-${{ matrix.config.mc-version }}
           ./gradlew clean build
           cd ../..
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/matrix.ps1 b/matrix.ps1
@@ -1,22 +1,25 @@
 param (
-    [string]$path
+    [string[]]$paths
 )
 
-$folders = Get-ChildItem -Path $path -Directory
+$allFolderObjects = @()
 
-$filteredFolders = $folders | Where-Object { $_.Name -ne "origin" -and $_.Name -ne "tool" }
+foreach ($path in $paths) {
+    $folders = Get-ChildItem -Path $path -Directory
+    $filteredFolders = $folders | Where-Object { $_.Name -ne "origin" }
 
-
-$folderObjects = $filteredFolders | ForEach-Object {
-    [PSCustomObject]@{
-        "mc-version" = $_.Name
-        "mc-loader"  = $path
+    $folderObjects = $filteredFolders | ForEach-Object {
+        [PSCustomObject]@{
+            "mc-version" = $_.Name
+            "mc-loader"  = $path
+        }
     }
+
+    $allFolderObjects += $folderObjects
 }
 
 $json = [PSCustomObject]@{
-    "config" = $folderObjects
+    "config" = $allFolderObjects
 } | ConvertTo-Json -Compress
 
-#Write-Output "matrix=$json" >> $GITHUB_OUTPUT
-Write-Output "::set-output name=matrix::$json"
+Write-Output "::set-output name=matrix::$json"