Merge pull request #31 from skogsbaer/sw/actions2

update actions
factisresearch · Jan 13, 2025 · 2394272 · 2394272
2 parents 67a9c81 + f4c0c47
commit 2394272
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 79 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -1,9 +1,10 @@
 name: Haskell-CI
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
+  workflow_dispatch:
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -20,11 +21,6 @@ jobs:
           - compiler: ghc-9.4
           - compiler: ghc-9.2
           - compiler: ghc-9.0
-          - compiler: ghc-8.8
-          - compiler: ghc-8.6
-          - compiler: ghc-8.4
-          - compiler: ghc-8.2
-          - compiler: ghc-8.0
       fail-fast: false
     steps:
       - name: Set PATH and environment variables

diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ cabal.sandbox.config
 *.hp
 .HTF/
 .stack-work/
+dist-newstyle/
diff --git a/stack-ghc90.yaml → stack-ghc-9.0.yaml b/stack-ghc90.yaml → stack-ghc-9.0.yaml
diff --git a/stack-ghc90.yaml.lock → stack-ghc-9.0.yaml.lock b/stack-ghc90.yaml.lock → stack-ghc-9.0.yaml.lock
diff --git a/stack-ghc92.yaml → stack-ghc-9.2.yaml b/stack-ghc92.yaml → stack-ghc-9.2.yaml
diff --git a/stack-ghc92.yaml.lock → stack-ghc-9.2.yaml.lock b/stack-ghc92.yaml.lock → stack-ghc-9.2.yaml.lock
diff --git a/stack-ghc86.yaml → stack-ghc-9.4.yaml b/stack-ghc86.yaml → stack-ghc-9.4.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.27
+resolver: lts-21.25
 require-stack-version: ">= 1.0.0"
 
 packages:

diff --git a/stack-ghc94.yaml.lock → stack-ghc-9.4.yaml.lock b/stack-ghc94.yaml.lock → stack-ghc-9.4.yaml.lock
diff --git a/stack-ghc96.yaml → stack-ghc-9.6.yaml b/stack-ghc96.yaml → stack-ghc-9.6.yaml
diff --git a/stack-ghc96.yaml.lock → stack-ghc-9.6.yaml.lock b/stack-ghc96.yaml.lock → stack-ghc-9.6.yaml.lock
diff --git a/stack-ghc80.yaml b/stack-ghc80.yaml
diff --git a/stack-ghc82.yaml b/stack-ghc82.yaml
diff --git a/stack-ghc84.yaml b/stack-ghc84.yaml
diff --git a/stack-ghc84.yaml.lock b/stack-ghc84.yaml.lock
diff --git a/stack-ghc88.yaml b/stack-ghc88.yaml
diff --git a/stack-ghc94.yaml b/stack-ghc94.yaml
diff --git a/stack.yaml b/stack.yaml
@@ -1 +1 @@
-stack-ghc96.yaml
+stack-ghc-9.6.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ cabal.sandbox.config @@
     *.hp
     .HTF/
     .stack-work/
+    dist-newstyle/