Add additional Solaris matrix paths

Author: michael-grunder

.github/workflows/ci.yml

@@ -125,52 +125,68 @@ jobs:
           ./test.sh
 
   solaris:
-    name: Solaris
-    runs-on: ubuntu-24.04
+     name: Solaris (threads=${{ matrix.use_threads }}, tls=${{ matrix.use_tls }})
+     runs-on: ubuntu-24.04
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+     strategy:
+       fail-fast: false
+       matrix:
+         use_threads: [0, 1]
+         use_tls: [0, 1]
 
-      - name: Transfer Oracle Studio certificates
-        env:
-          PKG_ORACLE_CERT: ${{ secrets.PKG_ORACLE_CERT }}
-          PKG_ORACLE_KEY: ${{ secrets.PKG_ORACLE_KEY }}
-        run: |
-          set -e
-          printf '%s\n' "$PKG_ORACLE_CERT" > pkg.oracle.com.certificate.pem
-          printf '%s\n' "$PKG_ORACLE_KEY" > pkg.oracle.com.key.pem
+     env:
+       PKG_ORACLE_CERT: ${{ secrets.PKG_ORACLE_CERT }}
+       PKG_ORACLE_KEY: ${{ secrets.PKG_ORACLE_KEY }}
 
-      - name: Build on Solaris
-        uses: vmactions/[email protected]
-        with:
-          usesh: true
-          # If you want more RAM/CPUs:
-          # mem: 4096
-          prepare: |
-            set -e
+     steps:
+       - name: Checkout
+         uses: actions/checkout@v4
+
+       - name: Transfer Oracle Studio certificates
+         run: |
+           set -e
+           printf '%s\n' "$PKG_ORACLE_CERT" \
+             > pkg.oracle.com.certificate.pem
+           printf '%s\n' "$PKG_ORACLE_KEY" \
+             > pkg.oracle.com.key.pem
 
-            # Copy cert/key from the mounted workspace into /root
-            cp "$GITHUB_WORKSPACE/pkg.oracle.com.key.pem" \
+       - name: Build on Solaris
+         uses: vmactions/[email protected]
+         env:
+           USE_THREADS: ${{ matrix.use_threads }}
+           USE_TLS: ${{ matrix.use_tls }}
+         with:
+           usesh: true
+           envs: 'USE_THREADS USE_TLS'
+           # mem: 4096  # uncomment/tune if you want more RAM
+           prepare: |
+             set -e
+
+             # Copy cert/key from the mounted workspace into /root
+             cp "$GITHUB_WORKSPACE/pkg.oracle.com.key.pem" \
                /root/pkg.oracle.com.key.pem
-            cp "$GITHUB_WORKSPACE/pkg.oracle.com.certificate.pem" \
+             cp "$GITHUB_WORKSPACE/pkg.oracle.com.certificate.pem" \
                /root/pkg.oracle.com.certificate.pem
 
-            sudo pkg set-publisher \
-              -k /root/pkg.oracle.com.key.pem \
-              -c /root/pkg.oracle.com.certificate.pem \
-              -G "*" \
-              -g https://pkg.oracle.com/solarisstudio/release \
-              solarisstudio
+             sudo pkg set-publisher \
+               -k /root/pkg.oracle.com.key.pem \
+               -c /root/pkg.oracle.com.certificate.pem \
+               -G "*" \
+               -g https://pkg.oracle.com/solarisstudio/release \
+               solarisstudio
+
+             sudo pkg install --accept developerstudio-126/cc
 
-            sudo pkg install --accept developerstudio-126/cc
+           run: |
+             set -e
+             PATH=/opt/developerstudio12.6/bin:"$PATH"
+             export PATH
 
-          run: |
-            set -e
-            PATH=/opt/developerstudio12.6/bin:"$PATH"
-            export PATH
+             echo "Building with USE_THREADS=$USE_THREADS USE_TLS=$USE_TLS"
 
-            gmake -j$(psrinfo -p)
+             USE_THREADS="$USE_THREADS" \
+             USE_TLS="$USE_TLS" \
+               gmake -j"$(psrinfo -p)"
 
   install:
     name: Installation tests