From d4612ab67a3d9e156dc2678f4c427ccf2f8f24af Mon Sep 17 00:00:00 2001
From: G-Ragghianti <ragghianti@icl.utk.edu>
Date: Mon, 19 Aug 2024 14:45:12 -0400
Subject: [PATCH] Adding --with-shlib-tools to CI matrix

---
 .github/workflows/ci.sh    |  8 +++++---
 .github/workflows/main.yml | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.sh b/.github/workflows/ci.sh
index 38652db2b..51e8d4581 100755
--- a/.github/workflows/ci.sh
+++ b/.github/workflows/ci.sh
@@ -2,7 +2,9 @@
 
 COMPONENT=$1
 DEBUG=$2
-COMPILER=$3
+SHLIB=$3
+COMPILER=$4
+
 
 [ -z "$COMPILER" ] && COMPILER=gcc@11
 
@@ -44,9 +46,9 @@ if [ "$COMPONENT" = "infiniband_umad" ]; then
 fi
 
 if [ "$COMPONENT" = "perf_event" ]; then
-  ./configure --with-debug=$DEBUG --enable-warnings
+  ./configure --with-debug=$DEBUG --enable-warnings --$SHLIB-shlib-tools
 else
-  ./configure --with-debug=$DEBUG --enable-warnings --with-components=$COMPONENT
+  ./configure --with-debug=$DEBUG --enable-warnings --$SHLIB-shlib-tools --with-components=$COMPONENT
 fi
 
 make -j4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0f3b01f6d..c599618dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,57 +10,73 @@ on:
   workflow_dispatch:
 
 jobs:
-  papi_component:
+  papi_component_cpu:
     strategy:
       matrix:
-        component: [perf_event, lmsensors, io, net, powercap, appio, coretemp, stealtime]
+        component: [perf_event, lmsensors, io, net, appio, coretemp, stealtime]
         debug: [yes, no]
+        shlib: [with, without]
+      fail-fast: false
+    runs-on: cpu
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v4
+      - name: Test
+        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}} ${{matrix.shlib}}
+  papi_component_cpu_intel:
+    strategy:
+      matrix:
+        component: [powercap]
+        debug: [yes, no]
+        shlib: [with, without]
       fail-fast: false
     runs-on: cpu_intel
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Test
-        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}}
+        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}} ${{matrix.shlib}}
   papi_component_nvidia:
     strategy:
       matrix:
         component: [cuda, nvml]
         debug: [yes, no]
+        shlib: [with, without]
       fail-fast: false
     runs-on: gpu_nvidia
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Test
-        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}}
+        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}} ${{matrix.shlib}}
   papi_component_amd:
     strategy:
       matrix:
         component: [rocm, rocm_smi]
         debug: [yes, no]
+        shlib: [with, without]
       fail-fast: false
     runs-on: gpu_amd
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Test
-        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}}
+        run: .github/workflows/ci.sh ${{matrix.component}} ${{matrix.debug}} ${{matrix.shlib}}
   papi_spack:
     runs-on: cpu
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build/Test/Install via Spack
         run: .github/workflows/spack.sh
   papi_clang_analysis:
     runs-on: cpu
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run static analysis
         run: .github/workflows/clang_analysis.sh clang-analysis-output
       - name: Archive analysis results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: clang-analysis-output