fix versions and make CI robust

.github/workflows/drishti-darshan-3.4.2.yml → .github/workflows/darshan-3.4.2.yml

@@ -2,99 +2,99 @@ name: Drishti (Darshan 3.4.2)
 
 on:
   pull_request:
-  push:
   workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   drishti:
-    runs-on: ubuntu-latest
-    container: jlbez/dxt-explorer-ubuntu-20.04
-    timeout-minutes: 60
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    timeout-minutes: 20
 
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
 
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install cmake gcc git libtool python3 python3-pip libcurl4-openssl-dev software-properties-common  -y
-
-          # Darshan
-          git clone https://github.com/darshan-hpc/darshan.git darshan-3.4.2
-          cd darshan-3.4.2
-          git checkout darshan-3.4.2
+          git clone https://github.com/darshan-hpc/darshan.git
 
-          pip install --upgrade pip
+      - name: Install macOS Dependencies
+        if: runner.os == 'macOS'
+        run: |
+          brew install libtool autoconf automake
 
       - name: Build Darshan
         run: |
-          export DARSHAN_DIR=/opt/darshan
-
-          mkdir $DARSHAN_DIR
-          cd darshan-3.4.2
+          cd darshan
+          git checkout darshan-3.4.2
           bash prepare.sh
           cd darshan-util
-          ./configure --prefix=$DARSHAN_DIR
+          ./configure
           make
-          make install
+          sudo make install
 
-      - name: Install py-darshan
+      - name: Configure Linux
+        if: runner.os == 'Linux'
         run: |
-          pip install darshan==3.4.2
+          sudo ldconfig
 
       - name: Install Drishti
         run: |
+          python -m ensurepip --upgrade
+          pip install --upgrade setuptools
+          pip install darshan==3.4.2
           pip install -r requirements.txt
           pip install .
 
       - name: Run Drishti (--help)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
           drishti -h
 
       - name: Run Drishti (--issues)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
           drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
       - name: Run Drishti (--code)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
-          drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+           drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
       - name: Run DXT Explorer (--verbose)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
           drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
       - name: Run DXT Explorer (--path)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
-          drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+           drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
       - name: Run DXT Explorer (--html)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
-
           drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
       - name: Run DXT Explorer (--svg)
         run: |
-          export PATH=/opt/darshan/bin:$PATH
+           drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
 
-          drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+      - name: Setup upterm session
+        if: ${{ failure() }}
+        uses: owenthereal/action-upterm@v1
 
       - name: Upload Artifact
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: tests
+          name: tests-${{ matrix.os }}-${{ matrix.python-version }}
           path: sample/**
           retention-days: 1

.github/workflows/darshan-3.4.4.yml

@@ -0,0 +1,100 @@
+name: Drishti (Darshan 3.4.4)
+
+on:
+  pull_request:
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  drishti:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Dependencies
+        run: |
+          git clone https://github.com/darshan-hpc/darshan.git
+
+      - name: Install macOS Dependencies
+        if: runner.os == 'macOS'
+        run: |
+          brew install libtool autoconf automake
+
+      - name: Build Darshan
+        run: |
+          cd darshan
+          git checkout darshan-3.4.4
+          bash prepare.sh
+          cd darshan-util
+          ./configure
+          make
+          sudo make install
+
+      - name: Configure Linux
+        if: runner.os == 'Linux'
+        run: |
+          sudo ldconfig
+
+      - name: Install Drishti
+        run: |
+          python -m ensurepip --upgrade
+          pip install --upgrade setuptools
+          pip install darshan==3.4.4
+          pip install -r requirements.txt
+          pip install .
+
+      - name: Run Drishti (--help)
+        run: |
+          drishti -h
+
+      - name: Run Drishti (--issues)
+        run: |
+          drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run Drishti (--code)
+        run: |
+           drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--verbose)
+        run: |
+          drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--path)
+        run: |
+           drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--html)
+        run: |
+          drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--svg)
+        run: |
+           drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Setup upterm session
+        if: ${{ failure() }}
+        uses: owenthereal/action-upterm@v1
+
+      - name: Upload Artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-${{ matrix.os }}-${{ matrix.python-version }}
+          path: sample/**
+          retention-days: 1

.github/workflows/darshan-3.4.6.yml

@@ -0,0 +1,100 @@
+name: Drishti (Darshan 3.4.6)
+
+on:
+  pull_request:
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  drishti:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest", "macos-latest"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+
+    timeout-minutes: 20
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Dependencies
+        run: |
+          git clone https://github.com/darshan-hpc/darshan.git
+
+      - name: Install macOS Dependencies
+        if: runner.os == 'macOS'
+        run: |
+          brew install libtool autoconf automake
+
+      - name: Build Darshan
+        run: |
+          cd darshan
+          git checkout darshan-3.4.6
+          bash prepare.sh
+          cd darshan-util
+          ./configure
+          make
+          sudo make install
+
+      - name: Configure Linux
+        if: runner.os == 'Linux'
+        run: |
+          sudo ldconfig
+
+      - name: Install Drishti
+        run: |
+          python -m ensurepip --upgrade
+          pip install --upgrade setuptools
+          pip install darshan==3.4.6
+          pip install -r requirements.txt
+          pip install .
+
+      - name: Run Drishti (--help)
+        run: |
+          drishti -h
+
+      - name: Run Drishti (--issues)
+        run: |
+          drishti --issues sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run Drishti (--code)
+        run: |
+           drishti --code sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--verbose)
+        run: |
+          drishti --verbose sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--path)
+        run: |
+           drishti --path sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--html)
+        run: |
+          drishti --html sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Run DXT Explorer (--svg)
+        run: |
+           drishti --svg sample/jlbez_8a_benchmark_write_parallel_id1321662_8-21-5892-15802854900629188750_106.darshan
+
+      - name: Setup upterm session
+        if: ${{ failure() }}
+        uses: owenthereal/action-upterm@v1
+
+      - name: Upload Artifact
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: tests-${{ matrix.os }}-${{ matrix.python-version }}
+          path: sample/**
+          retention-days: 1