Feature/atlas import

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ampersandtarski/ampersand-devcontainer:latest
+FROM ampersandtarski/ampersand-devcontainer:ghc9-6-4_1
 
 ENV DEBIAN_FRONTEND=dialog
 

.devcontainer/DockerfileUpstream

@@ -16,21 +16,26 @@ ENV USERNAME=${USERNAME} \
 RUN \
     apt-get update -y && \
     apt-get install -y --no-install-recommends \
+    apt-transport-https \
+    autoconf \
+    automake \
+    build-essential \
     curl \
-    libnuma-dev \
-    zlib1g-dev \
+    gcc \
+    git \
+    gnupg2 \
+    graphviz \
+    libbz2-dev \
+    libexpat1-dev \
     libgmp-dev \
     libgmp10 \
-    git \
-    wget \
+    libnuma-dev \
     lsb-release \
+    openssh-server \
+    pkg-config \
     software-properties-common \
-    gnupg2 \
-    apt-transport-https \
-    gcc \
-    autoconf \
-    automake \
-    build-essential \
+    wget \
+    zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
 RUN groupadd --gid $USER_GID $USERNAME && \
@@ -57,10 +62,10 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 # Add ghcup and cabal to the PATH
 ENV PATH="${WDIR}/.cabal/bin:${WDIR}/.ghcup/bin:${PATH}:${WDIR}/.local/bin:${PATH}"
 
-ARG GHC=8.10.7
-ARG CABAL=3.6.2.0
-ARG HLS=2.2.0.0
-ARG STACK=2.11.1
+ARG GHC=9.6.4
+ARG CABAL=3.10.2.1
+ARG HLS=2.7.0.0
+ARG STACK=2.15.5
 
 # install GHC and cabal
 
@@ -73,9 +78,9 @@ FROM base as tools
 
 # Install global packages.
 # Versions are pinned, since we don't want to accidentally break anything (by always installing latest).
-RUN cabal install -v haskell-dap-0.0.15.0 && \
-    cabal install -v stylish-haskell-0.13.0.0 && \
-    cabal install -v ormolu-0.1.3.1
+RUN cabal install -v haskell-dap-0.0.16.0 && \
+    cabal install -v stylish-haskell-0.14.5.0 && \
+    cabal install -v ormolu-0.7.2.0
 # RUN cabal install -v ghci-dap-0.0.19.0
 # RUN cabal install -v haskell-debug-adapter-0.0.37.0
 # RUN cabal install -v hlint-3.2.7

.devcontainer/README.md

@@ -20,7 +20,9 @@ NB: This action is currently done by Han, no need for other people to do so. It
 Sometimes there are updates of the Haskell toolchain we use. For instance whenever a new version of the Haskell Language Server is made available, the `DockerfileUpstream` should be updated accordingly. Then, the new image should be built and published at dockerhub. To do so, go to the ampersand root directory and run the following commands:
 
 ```
-docker build -f .devcontainer/DockerfileUpstream -t ampersandtarski/ampersand-devcontainer:latest .
-docker push ampersandtarski/ampersand-devcontainer:latest
+docker build -f .devcontainer/DockerfileUpstream -t ampersandtarski/ampersand-devcontainer:<tag> .
+docker push ampersandtarski/ampersand-devcontainer:<tag>
 
 ```
+
+where `<tag>` must be replaced with an appropriate new tagname reflecting the version of ghc.

.devcontainer/devcontainer.json

@@ -1,29 +1,34 @@
 {
-  "name": "DevContainer for Ampersand",
+  "name": "Ampersand 4 devcontainer",
   // "remoteUser": "root",
   "runArgs": [],
   "build": {
     "context": "..",
     "dockerfile": "Dockerfile"
   },
+  "mounts": [
+    "type=bind,source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh/,target=/home/vscode/.ssh,readonly"
+  ],
   "postStartCommand": "stack build",
   "customizations": {
     "vscode": {
       "extensions": [
-        "haskell.haskell",
-        "justusadam.language-haskell",
-        "phoityne.phoityne-vscode",
+        "ampersandtarski.language-ampersand",
+        // Because of bug (see https://github.com/Microsoft/vscode/issues/45997):
+        "bdsoftware.format-on-auto-save",
+        "eamodio.gitlens",
+        "editorconfig.editorconfig",
         "eriksik2.vscode-ghci",
-        "jcanero.hoogle-vscode",
         "github.vscode-pull-request-github",
-        "eamodio.gitlens",
+        "haskell.haskell",
+        "huizhou.githd",
+        "jcanero.hoogle-vscode",
+        "justusadam.language-haskell",
         "me-dutour-mathieu.vscode-github-actions",
-        "redhat.vscode-yaml",
-        "ampersandtarski.language-ampersand",
         "mhutchie.git-graph",
-        "editorconfig.editorconfig",
-        // Because of bug (see https://github.com/Microsoft/vscode/issues/45997):
-        "bdsoftware.format-on-auto-save"
+        "phoityne.phoityne-vscode",
+        "redhat.vscode-yaml",
+        "tintinweb.graphviz-interactive-preview"
       ],
       "settings": {
         "editor.formatonsave": true,

.github/workflows/ci2.yml

@@ -1,99 +1,106 @@
-# Inspired by https://tech.freckle.com/2021/05/18/haskell-on-actions/
-name: Build and test 🚀
-on:
-  push:
-    branches:
-      - "**" # Only trigger on branches (i.e. not tags, ..)
-    paths-ignore:
-      - "docs/**" # If only documentation changes, no need to build.
-jobs:
-  build-and-test-docker:
-    name: Build with Docker
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_AMPERSAND_IMAGE: ampersandtarski/ampersand
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Prepare for docker
-        run: |
-          echo Running on branch ${GITHUB_REF##*/}
-          docker version
-
-      - name: Build final image
-        run: docker build . --tag ${DOCKER_AMPERSAND_IMAGE}:latest --build-arg GIT_SHA=${{ github.sha }} --build-arg GIT_Branch=${{ github.ref }}
-
-      # For main branch push latest to DockerHub
-      - name: Login to DockerHub
-        if: github.ref == 'refs/heads/main'
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
-      - name: Push latest
-        if: github.ref == 'refs/heads/main'
-        run: docker push ${DOCKER_AMPERSAND_IMAGE}:latest
-
-  build-and-test-ubuntu:
-    name: Build and test on ubuntu-latest 🏗 🧪
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout project contents 📡
-        uses: actions/checkout@v3
-      - name: Use cache when available 📦
-        uses: freckle/stack-cache-action@main
-      - name: Set up Mariadb 🧰
-        uses: shogo82148/actions-setup-mysql@v1
-        with:
-          mysql-version: "mariadb-10.6"
-      - name: Build and test 🏗 🧪
-        uses: freckle/stack-action@main # stack-action does all these steps: dependencies, build, test.
-        with:
-          stack-arguments: "--copy-bins --flag ampersand:buildAll"
-
-  build-and-test-macOS:
-    name: Build and test on macOS  🏗 🧪
-    runs-on: macos-latest
-    steps:
-      - name: Checkout project contents 📡
-        uses: actions/checkout@v3
-      - name: Use cache when available 📦
-        uses: freckle/stack-cache-action@main
-      - name: Set up Mariadb 🧰
-        uses: shogo82148/actions-setup-mysql@v1
-        with:
-          mysql-version: "mariadb-10.6"
-      - name: Build and test  🏗 🧪
-        uses: freckle/stack-action@main
-        with:
-          stack-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
-      - name: Use cache (manually) 📦 # See https://github.com/freckle/stack-cache-action/issues/5
-        uses: actions/[email protected]
-        # 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@main
-        with:
-          stack-arguments: "--copy-bins --flag ampersand:buildAll"
+# Inspired by https://tech.freckle.com/2021/05/18/haskell-on-actions/
+name: Build and test 🚀
+on:
+  push:
+    branches:
+      - "**" # Only trigger on branches (i.e. not tags, ..)
+    paths-ignore:
+      - "docs/**" # If only documentation changes, no need to build.
+jobs:
+  build-and-test-docker:
+    name: Build with Docker
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_AMPERSAND_IMAGE: ampersandtarski/ampersand
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Prepare for docker
+        run: |
+          echo Running on branch ${GITHUB_REF##*/}
+          docker version
+
+      - name: Build final image
+        run: docker build . --tag ${DOCKER_AMPERSAND_IMAGE}:latest --build-arg GIT_SHA=${{ github.sha }} --build-arg GIT_Branch=${{ github.ref }}
+
+      # For main branch push latest to DockerHub
+      - name: Login to DockerHub
+        if: github.ref == 'refs/heads/main'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - name: Push latest
+        if: github.ref == 'refs/heads/main'
+        run: docker push ${DOCKER_AMPERSAND_IMAGE}:latest
+
+  build-and-test-ubuntu:
+    name: Build and test on ubuntu-latest 🏗 🧪
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout project contents 📡
+        uses: actions/checkout@v3
+      - name: Set up Mariadb 🧰
+        uses: shogo82148/actions-setup-mysql@v1
+        with:
+          mysql-version: "mariadb-10.6"
+      - name: Build and test 🏗 🧪
+        uses: freckle/stack-action@v5 # stack-action does all these steps: dependencies, build, test.
+        with:
+          stack-build-arguments: "--copy-bins --flag ampersand:buildAll"
+          upgrade-stack: false
+          cache-save-always: true
+
+  build-and-test-macOS:
+    name: Build and test on macOS  🏗 🧪
+    runs-on: macos-12 
+    steps:
+      - name: Checkout project contents 📡
+        uses: actions/checkout@v3
+      - name: Use cache when available 📦
+        uses: freckle/stack-cache-action@main
+      - 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: brew install php
+      - 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
+
+  build-and-test-windows:
+    name: Build and test on Windows 🏗 🧪
+    runs-on: windows-latest
+    steps:
+      - name: Checkout project contents 📡
+        uses: actions/checkout@v3
+      - name: Use cache (manually) 📦 # See https://github.com/freckle/stack-cache-action/issues/5
+        uses: actions/[email protected]
+        # 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