reduce matrix

hugcabbage · hugcabbage · commit 6813f0d178bb · 2024-09-16T14:28:29.000+08:00
diff --git a/.github/workflows/renew-all.yml b/.github/workflows/renew-all.yml
@@ -12,24 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DEPLOY_DIR: ${{ matrix.deploydir }}
-      DOT_CONFIG: ${{ matrix.dotconfig }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         deploydir:
           - preset-lede
           - preset-openwrt
           - preset-immortalwrt
           - preset-lienol-openwrt
           - preset-x-wrt
-        dotconfig:
-          - 1.config
-          - 2.config
-        include:
-          - deploydir: preset-openwrt
-            dotconfig: multi-common.config
-          - deploydir: preset-openwrt
-            dotconfig: multi-mini.config
     steps:
 
     - uses: actions/checkout@v4
@@ -38,27 +29,30 @@ jobs:
       env:
         RENEW_PY: extra-files/renew.py
       run: |
-        chmod +x $RENEW_PY
-        $RENEW_PY
+        DOT_CONFIG_ARRAY=(1.config 2.config)
+        if [ "$DEPLOY_DIR" = "preset-openwrt" ]; then
+          DOT_CONFIG_ARRAY+=(multi-common.config multi-mini.config)
+        fi
+        for DOT_CONFIG in "${DOT_CONFIG_ARRAY[@]}"; do
+          chmod +x $RENEW_PY
+          $RENEW_PY
+        done
 
     - uses: actions/upload-artifact@v4
       with:
         name: ${{ env.DEPLOY_DIR }}
         path: ${{ env.DEPLOY_DIR }}
 
   commit:
-    if: always()
     needs: renew
     runs-on: ubuntu-latest
     steps:
 
     - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v3
-    
-    - uses: actions/download-artifact@v3
-      
-    - uses: geekyeggo/delete-artifact@v2
+    - uses: actions/download-artifact@v4
+
+    - uses: geekyeggo/delete-artifact@v5
       with:
           name: '*'
 
diff --git a/.github/workflows/renew.yml b/.github/workflows/renew.yml
@@ -19,55 +19,28 @@ permissions:
 
 jobs:
 
-  set-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      dotconfig: ${{ steps.set-matrix.outputs.dotconfig }}
-      deploydir: ${{ steps.set-matrix.outputs.deploydir }}
-    steps:
-
-      - uses: actions/checkout@v4
-      
-      - id: set-matrix        
-        uses: actions/github-script@v6
-        with:
-          script: |
-            const fs = require('fs');
-            let dotconfig = [];
-            let cLs = "${{ inputs.dotconfig }}".replaceAll(' ', '').split(',');
-            let deploydir = "${{ inputs.deploydir }}".trim();
-            if (deploydir.endsWith('/')) deploydir = deploydir.slice(0, -1);
-            for (i=0; i<cLs.length; i++) {
-                try {
-                    fs.accessSync(deploydir + '/' + cLs[i]);
-                    dotconfig.push(cLs[i]);
-                }
-                catch (err) {
-                    console.log(cLs[i] + ' does not exist!');
-                }
-            }
-            core.setOutput("dotconfig", JSON.stringify(dotconfig));
-            core.setOutput("deploydir", deploydir);
-
   renew:
-    needs: set-matrix
     runs-on: ubuntu-latest
-    env:
-      DEPLOY_DIR: ${{ needs.set-matrix.outputs.deploydir }}
-      DOT_CONFIG: ${{ matrix.dotconfig }}
-    strategy:
-      matrix: 
-        dotconfig: ${{ fromJSON(needs.set-matrix.outputs.dotconfig) }}
     steps:
 
     - uses: actions/checkout@v4
 
     - name: Carry out
       env:
         RENEW_PY: extra-files/renew.py
+        DEPLOY_DIR: ${{ inputs.deploydir }}
+        DOT_CONFIG_IN: ${{ inputs.dotconfig }}
       run: |
-        chmod +x $RENEW_PY
-        $RENEW_PY
+        if [ ! -d "$DEPLOY_DIR" ]; then
+          echo "Directory $DEPLOY_DIR does not exist!"
+          exit 1
+        fi
+    
+        DOT_CONFIG_ARRAY=($(echo $DOT_CONFIG_IN | tr -d ' ' | tr ',' '\n'))
+        for DOT_CONFIG in "${DOT_CONFIG_ARRAY[@]}"; do
+          chmod +x $RENEW_PY
+          $RENEW_PY
+        done
 
     - uses: actions/upload-artifact@v4
       with:
@@ -81,9 +54,9 @@ jobs:
 
     - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       
-    - uses: geekyeggo/delete-artifact@v2
+    - uses: geekyeggo/delete-artifact@v5
       with:
           name: '*'
 
diff --git a/extra-files/tools/routine_cmd.py b/extra-files/tools/routine_cmd.py
@@ -1,3 +1,4 @@
+import os
 import subprocess
 
 
@@ -12,5 +13,7 @@ def gen_dot_config(clone: str, config: str):
         f'mv -f {config} .config && make defconfig',
         f'cp -f .config {config}'
     ]
+    if os.path.isdir('feeds'):
+        commands[:] = commands[2:]
     for cmd in commands:
         subprocess.run(cmd, shell=True)
