Merge branch 'main' into grammar-update

informalsystems · Oct 3, 2024 · eda14be · eda14be
2 parents 1298113 + 15328f8
commit eda14be
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+
 ## v0.22.1 -- 2024-10-02
 
 ### Added
@@ -31,6 +32,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Deprecated
 ### Removed
 ### Fixed
+=======
+## v0.22.1 -- 2024-09-25
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+- Some error scenarios when importing files on Windows were fixed (#1498)
+- `quint verify` on Windows should now properly start an Apalache server on the
+  background (#1499)
+- `quint verify` on Linux properly terminates the spawned instance (#1520)
+
 ### Security
 
 ## v0.22.0 -- 2024-09-09

diff --git a/quint/package-lock.json b/quint/package-lock.json
diff --git a/quint/package.json b/quint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@informalsystems/quint",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Core tool for the Quint specification language",
   "keywords": [
     "temporal",

diff --git a/quint/src/apalache.ts b/quint/src/apalache.ts
@@ -75,7 +75,7 @@ export function serverEndpointToConnectionString(endpoint: ServerEndpoint): stri
   return `${endpoint.hostname}:${endpoint.port}`
 }
 
-const APALACHE_VERSION_TAG = '0.44.11'
+const APALACHE_VERSION_TAG = '0.46.1'
 // TODO: used by GitHub api approach: https://github.com/informalsystems/quint/issues/1124
 // const APALACHE_TGZ = 'apalache.tgz'
 
@@ -454,15 +454,17 @@ export async function connect(
             verbosityLevel >= verbosity.defaultLevel
               ? ['ignore', process.stdout, process.stderr]
               : ['ignore', 'ignore', 'ignore']
-          const options = { shell: true, stdio: stdio }
+          // importantly, do not wrap the command in a shell,
+          // as this will prevent the child process from being properly terminated
+          const options = { shell: false, stdio: stdio }
           const args = ['server', `--port=${serverEndpoint.port}`]
           const apalache = child_process.spawn(exe, args, options)
 
           // Exit handler that kills Apalache if Quint exists
           function exitHandler() {
             debugLog(verbosityLevel, 'Shutting down Apalache server')
             try {
-              process.kill(apalache.pid!)
+              apalache.kill('SIGTERM')
             } catch (error: any) {
               // ESRCH is raised if no process with `pid` exists, i.e.,
               // if Apalache server exited on its own
@@ -476,6 +478,7 @@ export async function connect(
 
           if (apalache.pid) {
             // Apalache launched successfully
+            debugLog(verbosityLevel, `Started Apalache server on pid=${apalache.pid}`)
 
             // Install exit handler that kills Apalache if Quint exists
             process.on('exit', exitHandler.bind(null))

diff --git a/quint/src/version.ts b/quint/src/version.ts
@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '0.22.0'
+export const version = '0.22.1'
diff --git a/vscode/quint-vscode/CHANGELOG.md b/vscode/quint-vscode/CHANGELOG.md
@@ -14,6 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security
 
+## v0.14.6 -- 2024-09-25
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ## v0.14.5 -- 2024-09-09
 
 ### Added

diff --git a/vscode/quint-vscode/package-lock.json b/vscode/quint-vscode/package-lock.json
diff --git a/vscode/quint-vscode/package.json b/vscode/quint-vscode/package.json
@@ -3,7 +3,7 @@
 	"displayName": "Quint",
 	"description": "Language support for Quint specifications",
 	"icon": "./icons/logo.png",
-	"version": "0.14.5",
+	"version": "0.14.6",
 	"publisher": "informal",
 	"engines": {
 		"vscode": "^1.52.0"

diff --git a/vscode/quint-vscode/server/package-lock.json b/vscode/quint-vscode/server/package-lock.json
diff --git a/vscode/quint-vscode/server/package.json b/vscode/quint-vscode/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@informalsystems/quint-language-server",
   "description": "Language Server for the Quint specification language",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "author": "Informal Systems",
   "contributors": [
     {
@@ -43,7 +43,7 @@
     "test/**/*.ts"
   ],
   "dependencies": {
-    "@informalsystems/quint": "^0.21.2",
+    "@informalsystems/quint": "^0.22.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-uri": "^3.0.7"