Merge pull request #42 from Neptune650/master

Fix build and add CI

Author: tommythorn

.github/workflows/haskell.yml

@@ -0,0 +1,40 @@
+name: Haskell CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: haskell-actions/setup@v2
+      with:
+        ghc-version: 'latest'
+        cabal-version: 'latest'
+        stack-version: 'latest'
+
+    - name: Cache
+      uses: actions/cache@v3
+      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 dependencies
+      run: sudo apt update && sudo apt install iverilog verilator
+
+    - name: Build and test
+      run: make

flite/Makefile

@@ -1,3 +1,3 @@
-dist/build/Flite/flite.always:
-	cabal configure
-	cabal $(J) build
+dist/flite:
+	stack --install-ghc build
+	stack --local-bin-path dist install

flite/flite.cabal

@@ -8,7 +8,7 @@ Maintainer:         Jason Reich <[email protected]>, Matthew Naylor <[email protected]
 Stability:          provisional
 Homepage:           http://www.cs.york.ac.uk/fp/reduceron/
 Build-Type:         Simple
-Cabal-Version:      >=1.6
+Cabal-Version:      >=1.8
 Description:        The f-lite language is a subset of Haskell 98 and Clean consisting of function
                     definitions, pattern matching, limited let expressions, function applications and
                     constructor applications expressed in the explicit 'braces' layout-insensitive format.
@@ -32,7 +32,6 @@ Executable flite
                     Flite.InterpFrontend, Flite.LambdaLift, Flite.Let, Flite.Matching,
                     Flite.Predex, Flite.Pretty, Flite.RedCompile, Flite.RedFrontend,
                     Flite.RedSyntax, Flite.State, Flite.Strictify, Flite.Syntax,
-                    Flite.Traversals, Flite.Writer, Flite.Writer, Flite.WriterState,
-                    Flite.Parsec.Parse, Flite.Parsec.Flite, Flite.Parsec.Prelude,
-                    Flite.Dependency, Flite.IntInfer, Flite.Strictness, Flite.WorkerWrapper,
-                    Paths_flite
+                    Flite.Traversals, Flite.Writer, Flite.WriterState, Flite.Parsec.Parse,
+                    Flite.Parsec.Flite, Flite.Parsec.Prelude, Flite.Dependency, Flite.IntInfer,
+                    Flite.Strictness, Flite.WorkerWrapper, Paths_flite

flite/stack.yaml

@@ -0,0 +1,67 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# A 'specific' Stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# snapshot: lts-22.28
+# snapshot: nightly-2024-07-05
+# snapshot: ghc-9.6.6
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# snapshot: ./custom-snapshot.yaml
+# snapshot: https://example.com/snapshots/2024-01-01.yaml
+snapshot:
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+- .
+# Dependency packages to be pulled from upstream that are not in the snapshot.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+# extra-deps:
+# - acme-missiles-0.3
+# - git: https://github.com/commercialhaskell/stack.git
+#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#
+# extra-deps: []
+
+# Override default flag values for project packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of Stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=3.1"
+#
+# Override the architecture used by Stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by Stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor

programs/Makefile

@@ -10,8 +10,7 @@ WORKLOADS=And SmallFib Example Fib Parts CountDown KnuthBendix Adjoxo \
 BENCHLOADS=Cichelli Braun OrdList Queens2 MSS Queens PermSort SumPuz Mate2 Mate
 
 EMU=../emulator/emu
-# XXX this is broken now as cabal has change; FIXME
-FLITE=../flite/dist/build/flite/flite
+FLITE=../flite/dist/flite
 FLITE_RED=-r6:4:2:1:8 -i1 -s
 # Surprisingly there isn't a clear winner among h[0-3] i[0-3] s[0-1],
 # but this came out ahead
@@ -37,7 +36,7 @@ bench: bench-flite-c-comp
 $(EMU): ../emulator/emu.c
 	$(MAKE) -C ../emulator emu
 
-$(FLITE): flite.built
+$(FLITE):
 	$(MAKE) -C ../flite
 	touch flite.built