remove extra runner

seanhess · Feb 4, 2025 · 6519b84 · 6519b84
1 parent 4ff2f83
commit 6519b84
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/.github/workflows/haskell.yaml b/.github/workflows/haskell.yaml
@@ -10,43 +10,42 @@ permissions:
   contents: read
 
 steps: &cabal-test
-- uses: actions/checkout@v4
-
-- name: Cache Cabal
-  id: cache-cabal
-  uses: actions/cache@v4
-  with:
-    path: ~/.cabal
-    key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
-    restore-keys: |
-      ${{ runner.os }}-build-${{ env.cache-name }}-
-      ${{ runner.os }}-build-
-      ${{ runner.os }}-
-
-- name: Install dependencies
-  run: |
-    cabal update
-    cabal build --only-dependencies --enable-tests --enable-benchmarks
-- name: Build
-  run: cabal build --enable-tests --enable-benchmarks all
-- name: Test
-  run: cabal test
 
 
 
 jobs:
-
   build-982:
     runs-on: ubuntu-latest
     container:
       image: haskell:9.8.2
-    steps: *cabal-test
+    steps: 
+      - uses: actions/checkout@v4
 
-  build-966:
-    runs-on: ubuntu-latest
-    container:
-      image: haskell:9.6.6
-    steps: *cabal-test
+      - name: Cache Cabal
+        id: cache-cabal
+        uses: actions/cache@v4
+        with:
+          path: ~/.cabal
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: |
+          cabal update
+          cabal build --only-dependencies --enable-tests --enable-benchmarks
+      - name: Build
+        run: cabal build --enable-tests --enable-benchmarks all
+      - name: Test
+        run: cabal test
+
+  # build-966:
+  #   runs-on: ubuntu-latest
+  #   container:
+  #     image: haskell:9.6.6
+  #   steps: *cabal-test
 
 
     # - uses: actions/setup-haskell@v1