Merge pull request #1486 from AmpersandTarski/upgrade-ghc

Devcontainer enhancements

.devcontainer/Dockerfile

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

.devcontainer/DockerfileUpstream

@@ -31,6 +31,7 @@ RUN \
     libgmp10 \
     libnuma-dev \
     lsb-release \
+    openssh-server \
     pkg-config \
     software-properties-common \
     wget \

.devcontainer/devcontainer.json

@@ -6,26 +6,29 @@
     "context": "..",
     "dockerfile": "Dockerfile"
   },
-  // "postCreateCommand": "sudo apt-get update && sudo apt-get install -y openssh-client",
+  "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",
-        "rcook.ghci-helper"
+        "phoityne.phoityne-vscode",
+        "redhat.vscode-yaml",
+        "tintinweb.graphviz-interactive-preview"
       ],
       "settings": {
         "editor.formatonsave": true,

.github/workflows/ci2.yml

@@ -49,6 +49,8 @@ jobs:
         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  🏗 🧪

ReleaseNotes.md

@@ -1,5 +1,8 @@
 # Release notes of Ampersand
 
+## v5.1.1 (16 may 2024)
+- Some enhancements for the .devcontainer
+
 ## v5.1.0 (29 april 2024)
 
 - Upgrade development toolstack to ghc 9.6.4 This involved upgrades of several dependencies. 

ampersand.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           ampersand
-version:        5.1.0
+version:        5.1.1
 synopsis:       Toolsuite for automated design of enterprise information systems.
 description:    You can define your business processes by means of rules, written in Relation Algebra.
 category:       Database Design

package.yaml

@@ -1,5 +1,5 @@
 name: ampersand
-version: 5.1.0
+version: 5.1.1
 author: Stef Joosten
 maintainer: stef.joosten@ou.nl
 synopsis: Toolsuite for automated design of enterprise information systems.