From 3a49aa7f2f11a9e77d7f3f3be9a6c1fd61dfa92e Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Tue, 12 Jul 2022 02:24:00 +0100
Subject: Remove old CI directory

---
 .github/workflows/haskell.yml | 77 -------------------------------------------
 test/haskell.yml              | 77 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 77 deletions(-)
 delete mode 100644 .github/workflows/haskell.yml
 create mode 100644 test/haskell.yml

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
deleted file mode 100644
index e720e9e..0000000
--- a/.github/workflows/haskell.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Haskell CI (PRs)
-
-on:
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        cabal: ["3.2"]
-        ghc: ["8.4", "8.6", "8.8.3", "8.10"]
-    env:
-      CONFIG: "--enable-tests --enable-benchmarks -fall_extensions"
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - name: Cache
-      uses: actions/cache@v1
-      env:
-        cache-name: cache-cabal
-      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 packages
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y xorg-dev
-        sudo apt-get install -y libasound2-dev libxpm-dev libmpd-dev libxrandr-dev
-        sudo apt-get install -y happy c2hs hspec-discover
-
-    - name: Install dependencies
-      run: |
-        cabal update
-        cabal build --dependencies-only $CONFIG
-
-    - name: Build
-      run: cabal build $CONFIG
-
-    - name: Run hlint
-      run: |
-        wget https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh
-        sh ./travis.sh src
-    - name: Run tests
-      run: cabal test
-
-  # build-freebsd:
-  #   runs-on: macos-latest
-  #   env:
-  #     CONFIG: "--enable-tests --enable-benchmarks -fwith_xft -fwith_mpd"
-
-  #   steps:
-  #   - uses: actions/checkout@v2
-
-  #   - name: Install dependencies
-  #     uses: vmactions/freebsd-vm@v0.1.5
-  #     with:
-  #       usesh: true
-  #       prepare: pkg install -y ghc hs-hlint xorg-libraries hs-cabal-install git autoconf
-  #       run: |
-  #         cabal update
-  #         cabal build --dependencies-only $CONFIG
-  #         cabal build $CONFIG
-  #         hlint
-  #         cabal test
diff --git a/test/haskell.yml b/test/haskell.yml
new file mode 100644
index 0000000..e720e9e
--- /dev/null
+++ b/test/haskell.yml
@@ -0,0 +1,77 @@
+name: Haskell CI (PRs)
+
+on:
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        cabal: ["3.2"]
+        ghc: ["8.4", "8.6", "8.8.3", "8.10"]
+    env:
+      CONFIG: "--enable-tests --enable-benchmarks -fall_extensions"
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-haskell@v1
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: ${{ matrix.cabal }}
+
+    - name: Cache
+      uses: actions/cache@v1
+      env:
+        cache-name: cache-cabal
+      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 packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y xorg-dev
+        sudo apt-get install -y libasound2-dev libxpm-dev libmpd-dev libxrandr-dev
+        sudo apt-get install -y happy c2hs hspec-discover
+
+    - name: Install dependencies
+      run: |
+        cabal update
+        cabal build --dependencies-only $CONFIG
+
+    - name: Build
+      run: cabal build $CONFIG
+
+    - name: Run hlint
+      run: |
+        wget https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh
+        sh ./travis.sh src
+    - name: Run tests
+      run: cabal test
+
+  # build-freebsd:
+  #   runs-on: macos-latest
+  #   env:
+  #     CONFIG: "--enable-tests --enable-benchmarks -fwith_xft -fwith_mpd"
+
+  #   steps:
+  #   - uses: actions/checkout@v2
+
+  #   - name: Install dependencies
+  #     uses: vmactions/freebsd-vm@v0.1.5
+  #     with:
+  #       usesh: true
+  #       prepare: pkg install -y ghc hs-hlint xorg-libraries hs-cabal-install git autoconf
+  #       run: |
+  #         cabal update
+  #         cabal build --dependencies-only $CONFIG
+  #         cabal build $CONFIG
+  #         hlint
+  #         cabal test
-- 
cgit v1.2.3