fixup! ci

lifting-bits · Sep 1, 2024 · 5abc77e · 5abc77e
1 parent b066ecc
commit 5abc77e
Showing 1 changed file with 35 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,9 +31,9 @@ jobs:
 
     runs-on: ubuntu-${{ matrix.image-version }}
     timeout-minutes: 60
-    #container:
-    #  image:
-    #    ghcr.io/lifting-bits/patchestry-ubuntu-${{ matrix.image-version }}-llvm-${{ matrix.llvm-version }}-dev:latest
+    container:
+      image:
+        ghcr.io/lifting-bits/patchestry-ubuntu-${{ matrix.image-version }}-llvm-${{ matrix.llvm-version }}-dev:latest
 
     env:
         CMAKE_PREFIX_PATH: "/usr/lib/llvm-${{ matrix.llvm-version }}/lib/cmake/mlir/;/usr/lib/llvm-${{ matrix.llvm-version }}/lib/cmake/clang/"
@@ -50,9 +50,7 @@ jobs:
 
       - name: Configure build - sanitizers ${{ matrix.sanitizers }}
         uses: ghcr.io/lifting-bits/patchestry-ubuntu-${{ matrix.image-version }}-llvm-${{ matrix.llvm-version }}-dev:latest
-        with:
-          args: |
-            sh -c "cmake --preset ci"
+        run: cmake --preset ci"
 
       - name: Build ${{ matrix.build-type }} with sanitizers set ${{ matrix.sanitizers }}
         uses: ghcr.io/lifting-bits/patchestry-ubuntu-${{ matrix.image-version }}-llvm-${{ matrix.llvm-version }}-dev:latest
@@ -68,7 +66,36 @@ jobs:
             && sh get-docker.sh \
             && rm get-docker.sh
 
-      - name: Test ${{ matrix.build-type }} with sanitizers set ${{ matrix.sanitizers }}
+      #- name: Test ${{ matrix.build-type }} with sanitizers set ${{ matrix.sanitizers }}
+      #  run: |
+      #    cmake --preset ci
+      #    ctest --preset ci --build-config ${{ matrix.build-type }}
+
+  test:
+    needs: build
+    strategy:
+      matrix:
+        llvm-version: [18]
+        image-version: [22.04]
+        build-type: [Release, Debug]
+        sanitizers: [ON, OFF]
+
+    runs-on: ubuntu-${{ matrix.image-version }}
+    steps:
+      - name: Clone the Patchestry repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          fetch-depth: 1
+
+      - name: Install CTest dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake
+          curl -fsSL https://get.docker.com -o get-docker.sh \
+            && sh get-docker.sh \
+            && rm get-docker.sh
+      - name: Run CTest
         run: |
           cmake --preset ci
-          ctest --preset ci --build-config ${{ matrix.build-type }}
+          ctest --preset ci --build-config ${{ matrix.build-type }}