Merge branch 'release-v0.6.6'

* release-v0.6.6:
  Bump version and update changelog, move changelog in docs
  Use a more specific artifact name for rzk binaries
  Run tar in bash on Windows
  Use -optP-Wno-nonportable-include-path to fix an issue on macOS
  Run GHC workflow on 3 platforms
  Do not run BNFC on Windows (rely on pre-generated files)

.github/workflows/ghc.yml

@@ -33,7 +33,10 @@ permissions:
 jobs:
   build:
     name: "Build and test with GHC"
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
       - name: 📥 Checkout repository
@@ -47,12 +50,13 @@ jobs:
           mkdir -p bin/
           cp $(stack exec -- which rzk) bin/.
           tar -cvzf rzk-bin.tar.gz bin/
+        shell: bash
 
       - name: Upload rzk binary as Artifact
         uses: actions/upload-artifact@v3
         with:
           path: rzk-bin.tar.gz
-          name: rzk-bin
+          name: rzk-${{ runner.os }}-${{ runner.arch }}.tar.gz
           if-no-files-found: error
 
   haddock:
@@ -95,7 +99,7 @@ jobs:
         id: download
         uses: actions/download-artifact@v3
         with:
-          name: rzk-bin
+          name: rzk-${{ runner.os }}-${{ runner.arch }}.tar.gz
 
       - name: Unpack rzk-bin.tar.gz
         run: |

CITATION.cff

@@ -4,5 +4,5 @@ authors:
   given-names: Nikolai
   orcid: "https://orcid.org/0000-0001-6572-7292"
 title: "Rzk: a  proof assistant for synthetic $\\infty$-categories"
-version: 0.6.5
+version: 0.6.6
 url: "https://github.com/rzk-lang/rzk"

docs/docs/getting-started/changelog.md → docs/docs/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.6.6 — 2023-10-02
+
+- Fix builds on Windows (and macOS) (see [#121](https://github.com/rzk-lang/rzk/pull/121))
+
 ## v0.6.5 — 2023-10-01
 
 This version contains mostly intrastructure improvements:

docs/docs/index.md

@@ -14,4 +14,4 @@ Using such representation is motivated by automatic handling of binders and easi
 
 An important part of `rzk` is a tope layer solver, which is essentially a theorem prover for a part of the type theory. A related project, dedicated just to that part is available at <https://github.com/fizruk/simple-topes>. `simple-topes` supports used-defined cubes, topes, and tope layer axioms. Once stable, `simple-topes` will be merged into `rzk`, expanding the proof assistant to the type theory with shapes, allowing formalisations for (variants of) cubical, globular, and other geometric versions of HoTT.
 
-See the list of contributors at [docs/docs/CONTRIBUTORS.md](docs/docs/CONTRIBUTORS.md).
+See the list of contributors at [CONTRIBUTORS.md](CONTRIBUTORS.md).

docs/mkdocs.yml

@@ -7,11 +7,11 @@ nav:
   - General:
     - About: index.md
     - Contributors: CONTRIBUTORS.md
+    - Changelog: CHANGELOG.md
   - Getting Started:
     - Install: getting-started/install.md
     - Quickstart: getting-started/quickstart.rzk.md
     - Publishing with MkDocs: getting-started/publishing-with-mkdocs.md
-    - Changelog: getting-started/changelog.md
   - Reference:
     - Introduction: reference/introduction.rzk.md
     - Cube layer: reference/cube-layer.rzk.md

rzk/ChangeLog.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the
 [Haskell Package Versioning Policy](https://pvp.haskell.org/).
 
+## v0.6.6 — 2023-10-02
+
+- Fix builds on Windows (and macOS) (see [#121](https://github.com/rzk-lang/rzk/pull/121))
+
 ## v0.6.5 — 2023-10-01
 
 This version contains mostly intrastructure improvements:

rzk/Setup.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 -- Source: https://github.com/haskell/cabal/issues/6726#issuecomment-918663262
 
 -- | Custom Setup that runs bnfc to generate the language sub-libraries
@@ -18,7 +19,9 @@ main :: IO ()
 main = defaultMainWithHooks $ simpleUserHooks
   { hookedPrograms = [ bnfcProgram ]
   , postConf       = \args flags packageDesc localBuildInfo -> do
+#ifndef mingw32_HOST_OS
       _ <- system "bnfc -d -p Language.Rzk --generic --functor -o src/ grammar/Syntax.cf"
+#endif
       postConf simpleUserHooks args flags packageDesc localBuildInfo
   }
 

rzk/package.yaml

@@ -1,5 +1,5 @@
 name: rzk
-version: 0.6.5
+version: 0.6.6
 github: 'rzk-lang/rzk'
 license: BSD3
 author: 'Nikolai Kudasov'
@@ -60,6 +60,7 @@ ghc-options:
   - -Wmissing-home-modules
   - -Wpartial-fields
   - -Wredundant-constraints
+  - -optP-Wno-nonportable-include-path
 
 library:
   source-dirs: src

rzk/rzk.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.24
 -- see: https://github.com/sol/hpack
 
 name:           rzk
-version:        0.6.5
+version:        0.6.6
 synopsis:       An experimental proof assistant for synthetic ∞-categories
 description:    Please see the README on GitHub at <https://github.com/rzk-lang/rzk#readme>
 category:       Dependent Types
@@ -56,7 +56,7 @@ library
       Paths_rzk
   hs-source-dirs:
       src
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -optP-Wno-nonportable-include-path
   build-tools:
       alex >=3.2.4
     , happy >=1.19.9
@@ -99,7 +99,7 @@ executable rzk
       Paths_rzk
   hs-source-dirs:
       app
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
   build-tools:
       alex >=3.2.4
     , happy >=1.19.9
@@ -128,7 +128,7 @@ test-suite doctests
   main-is: doctests.hs
   hs-source-dirs:
       test
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -optP-Wno-nonportable-include-path
   build-tools:
       alex >=3.2.4
     , happy >=1.19.9
@@ -157,7 +157,7 @@ test-suite rzk-test
       Paths_rzk
   hs-source-dirs:
       test
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -optP-Wno-nonportable-include-path -threaded -rtsopts -with-rtsopts=-N
   build-tools:
       alex >=3.2.4
     , happy >=1.19.9