improve workflows for multi package strategy

gofiber · Jan 15, 2024 · 555417e · 555417e
1 parent ea00cb3
commit 555417e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -28,11 +28,10 @@ jobs:
             - name: Fetch Repository
               uses: actions/checkout@v4
             - name: Generate Matrix
-              working-directory: .
               id: generate-matrix
               run: |
-                  SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' | sed 's|./||' | tr '\n' ' ')
-                  JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ")')
+                  SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' -not -empty | sed 's|./||' | tr '\n' ' ' | sed 's/ $//')
+                  JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ") | map(select(. != "")) | .[-1] |= sub("\n$"; "")')
                   echo "::set-output name=matrix::$JSON_MATRIX"
               shell: bash
 

diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
@@ -28,11 +28,10 @@ jobs:
             - name: Fetch Repository
               uses: actions/checkout@v4
             - name: Generate Matrix
-              working-directory: .
               id: generate-matrix
               run: |
-                  SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' | sed 's|./||' | tr '\n' ' ')
-                  JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ")')
+                  SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' -not -empty | sed 's|./||' | tr '\n' ' ' | sed 's/ $//')
+                  JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ") | map(select(. != "")) | .[-1] |= sub("\n$"; "")')
                   echo "::set-output name=matrix::$JSON_MATRIX"
               shell: bash
 

diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml
@@ -28,12 +28,11 @@ jobs:
       - name: Fetch Repository
         uses: actions/checkout@v4
       - name: Generate Matrix
-        working-directory: .
         id: generate-matrix
         run: |
-          SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' | sed 's|./||' | tr '\n' ' ')
-          JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ")')
-          echo "::set-output name=matrix::$JSON_MATRIX"
+            SUBDIRS=$(find . -maxdepth 1 -type d -not -name '.*' -not -name 'internal' -not -empty | sed 's|./||' | tr '\n' ' ' | sed 's/ $//')
+            JSON_MATRIX=$(echo "$SUBDIRS" | jq -R -c -s 'split(" ") | map(select(. != "")) | .[-1] |= sub("\n$"; "")')
+            echo "::set-output name=matrix::$JSON_MATRIX"
         shell: bash
 
   govulncheck-check: