fix(ci): separate setup stage for musl

Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>
zowe · Jul 24, 2023 · c8d2bed · c8d2bed
1 parent 3486cfb
commit c8d2bed
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml
@@ -257,14 +257,24 @@ jobs:
         if: ${{ matrix.settings.host != 'ubuntu-latest' }}
       - name: Setup and run tests
         uses: addnab/docker-run-action@v3
-        if: ${{ matrix.settings.host == 'ubuntu-latest' }}
+        if: ${{ matrix.settings.host == 'ubuntu-latest' && !endsWith(matrix.settings.target, 'musl') }}
         with:
-          image: ${{ format('node:{0}-{1}', matrix.node, endsWith(matrix.settings.target, 'musl') && 'alpine' || 'slim') }}
+          image: ${{ format('node:{0}-slim', matrix.node) }}
           options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}"
           run: |
             set -e
-            ${{ endsWith(matrix.settings.target, 'musl') && 'apk add dbus gnome-keyring libsecret' || 'apt update -y && apt install -y gnome-keyring' }}
-            dbus-run-session -- source scripts/linux-test.sh
+            apt update -y && apt install -y gnome-keyring
+            dbus-run-session -- bash src/keyring/scripts/linux-test.sh
+      - name: Setup and run tests (MUSL)
+        uses: addnab/docker-run-action@v3
+        if: ${{ matrix.settings.host == 'ubuntu-latest' && endsWith(matrix.settings.target, 'musl') }}
+        with:
+          image: ${{ format('node:{0}-alpine', matrix.node) }}
+          options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}"
+          run: |
+            set -e
+            apk add dbus gnome-keyring libsecret
+            dbus-run-session -- sh src/keyring/scripts/linux-test.sh
   publish:
     defaults:
       run: