Merge branch 'main' into documentation

AmpersandTarski · Aug 11, 2024 · 5931a6c · 5931a6c
2 parents ba0c51a + d785b88
commit 5931a6c
Show file tree

Hide file tree

Showing 106 changed files with 67,472 additions and 4,204 deletions.
diff --git a/.ampersand b/.ampersand
@@ -1,4 +1,5 @@
 AmpersandData/FormalAmpersand/FormalAmpersand.adl
+AmpersandData/FormalAmpersand/Namespaces.adl
 AmpersandData/PrototypeContext/PrototypeContext.adl
 testing/Travis/testcases/Misc/FraakTest1.adl
 testing/Travis/testcases/Misc/FraakTest2.adl

diff --git a/.github/workflows/ci2.yml b/.github/workflows/ci2.yml
@@ -14,7 +14,7 @@ jobs:
       DOCKER_AMPERSAND_IMAGE: ampersandtarski/ampersand
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Prepare for docker
         run: |
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
@@ -54,44 +54,49 @@ jobs:
 
   build-and-test-macOS:
     name: Build and test on macOS  🏗 🧪
-    runs-on: macos-latest
+    runs-on: macos-12
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
           mysql-version: "mariadb-10.6"
       # See issue https://github.com/freckle/stack-action/issues/80 for why we need to install stack and php as well
-      - run: curl -sSL https://get.haskellstack.org/ | sh
+      ## run: curl -sSL https://get.haskellstack.org/ | sh
       - run: brew install php
       - name: Build and test  🏗 🧪
         uses: freckle/stack-action@v5
         with:
           stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
 
-  # build-and-test-windows:
-  #   name: Build and test on Windows 🏗 🧪
-  #   runs-on: windows-latest
-  #   steps:
-  #     - name: Checkout project contents 📡
-  #       uses: actions/checkout@v3
-  #     - uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # 1.6.0
-  #       id: expatLibraryZip  # Remember to give an ID if you need the output filename
-  #       name: Download the expat library
-  #       with:
-  #         url: "https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-win32bin-2.6.2.zip"
-  #         target: public/
-  #     - name: Set up Mariadb 🧰
-  #       uses: shogo82148/actions-setup-mysql@v1
-  #       with:
-  #         mysql-version: "mariadb-10.6"
-  #     - name: Setup PHP 🧰
-  #       uses: shivammathur/setup-php@v2
-  #       with:
-  #         php-version: "8.0"
-  #         extensions: mysqli
-  #     - name: Build and test 🏗 🧪
-  #       uses: freckle/stack-action@v5
-  #       with:
-  #         stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
+  build-and-test-windows:
+    name: Build and test on Windows 🏗 🧪
+    runs-on: windows-latest
+    steps:
+      - name: Checkout project contents 📡
+        uses: actions/checkout@v4
+      - name: Use cache (manually) 📦 # See https://github.com/freckle/stack-cache-action/issues/5
+        uses: actions/cache@v2.1.3
+        # TODO: Cache might be done better, see for inspiration:  https://github.com/godu/advent-of-code-2020/blob/46796832f59d185457a8edf8de043a54a451d688/.github/workflows/ci.yml
+        with:
+          path: |
+            ~/.ghc
+            ~/.stack
+            ~/.stack-work
+          key: ${{ runner.os }}-stack
+      - name: Set up Mariadb 🧰
+        uses: shogo82148/actions-setup-mysql@v1
+        with:
+          mysql-version: "mariadb-10.6"
+      - name: Setup PHP 🧰
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.0"
+          extensions: mysqli
+      - name: Build and test 🏗 🧪
+        uses: freckle/stack-action@v5
+        with:
+          stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
+          upgrade-stack: false
+          cache-save-always: true
diff --git a/.github/workflows/codeQuality.yml b/.github/workflows/codeQuality.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
       - name: Setup hlint
         uses: rwe/actions-hlint-setup@v1.0.3
       - name: Run hlint
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v4
       - name: Build the project 🌿🌿🌿
         uses: freckle/stack-action@v5
         with:

diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run hadolint
         uses: hadolint/hadolint-action@f988afea3da57ee48710a9795b6bb677cc901183

diff --git a/.github/workflows/ormolu-formatting-code.yml b/.github/workflows/ormolu-formatting-code.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # The checkout step is needed since the enforcer relies on local git commands
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: mrkkrp/ormolu-action@v15
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     name: Add release notes to artefacts
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Upload macOS artifact
         uses: actions/upload-release-asset@v1
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
@@ -167,7 +167,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout project contents 📡
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Mariadb 🧰
         uses: shogo82148/actions-setup-mysql@v1
         with:
@@ -192,7 +192,7 @@ jobs:
   #   runs-on: windows-latest
   #   steps:
   #     - name: Checkout project contents 📡
-  #       uses: actions/checkout@v3
+  #       uses: actions/checkout@v4
   #     # - name: Use cache (manually) 📦 # See https://github.com/freckle/stack-cache-action/issues/5
   #     # uses: actions/cache@v3.3.2
   #     # # TODO: Cache might be done better, see for inspiration:  https://github.com/godu/advent-of-code-2020/blob/46796832f59d185457a8edf8de043a54a451d688/.github/workflows/ci.yml

diff --git a/.github/workflows/releasenotes.yml b/.github/workflows/releasenotes.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # The checkout step is needed since the enforcer relies on local git commands
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: dangoslen/changelog-enforcer@v2
         with: