diff --git a/CHANGELOG.md b/CHANGELOG.md index 58157fc30..a15be921e 100644 --- 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 index 450dfb25b..bfe429ea0 100644 --- a/quint/package-lock.json +++ b/quint/package-lock.json @@ -1,12 +1,12 @@ { "name": "@informalsystems/quint", - "version": "0.22.0", + "version": "0.22.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@informalsystems/quint", - "version": "0.22.0", + "version": "0.22.1", "license": "Apache 2.0", "dependencies": { "@grpc/grpc-js": "^1.11.1", diff --git a/quint/package.json b/quint/package.json index 8c1c07e8d..d4aeef317 100644 --- 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 index dfd930eba..211bc38ae 100644 --- 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,7 +454,9 @@ 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) @@ -462,7 +464,7 @@ export async function connect( 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 index 40c879f02..62219759e 100644 --- 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 index 662463c7e..166563f38 100644 --- 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 index 79939f0c1..2aab8cadf 100644 --- a/vscode/quint-vscode/package-lock.json +++ b/vscode/quint-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "quint-vscode", - "version": "0.14.5", + "version": "0.14.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "quint-vscode", - "version": "0.14.5", + "version": "0.14.6", "hasInstallScript": true, "dependencies": { "vscode-languageclient": "^7.0.0" diff --git a/vscode/quint-vscode/package.json b/vscode/quint-vscode/package.json index 758b704ae..8ba6d5e41 100644 --- 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 index 4ce693172..99068e367 100644 --- a/vscode/quint-vscode/server/package-lock.json +++ b/vscode/quint-vscode/server/package-lock.json @@ -1,15 +1,15 @@ { "name": "@informalsystems/quint-language-server", - "version": "0.14.5", + "version": "0.14.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@informalsystems/quint-language-server", - "version": "0.14.5", + "version": "0.14.6", "license": "Apache 2.0", "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" @@ -476,9 +476,9 @@ "dev": true }, "node_modules/@informalsystems/quint": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.21.2.tgz", - "integrity": "sha512-Kma6heRMuz1wBMWh6DD+HyOrZiM8ifW9/qofuWZuLzLUQzNJSbTo+IQRFll6IWh+u4x9D2oE0nEa/uy6JkFEVA==", + "version": "0.22.1", + "resolved": "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.22.1.tgz", + "integrity": "sha512-DslewyqAICTnCPxla2oM0U048k8eMrOv1L/LiW93TwhovIVheQTEvmPNrdntYE2HQ8dF3ib4Wi9/Tx77drzrWw==", "dependencies": { "@grpc/grpc-js": "^1.11.1", "@grpc/proto-loader": "^0.7.7", @@ -7223,9 +7223,9 @@ "dev": true }, "@informalsystems/quint": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.21.2.tgz", - "integrity": "sha512-Kma6heRMuz1wBMWh6DD+HyOrZiM8ifW9/qofuWZuLzLUQzNJSbTo+IQRFll6IWh+u4x9D2oE0nEa/uy6JkFEVA==", + "version": "0.22.1", + "resolved": "https://registry.npmjs.org/@informalsystems/quint/-/quint-0.22.1.tgz", + "integrity": "sha512-DslewyqAICTnCPxla2oM0U048k8eMrOv1L/LiW93TwhovIVheQTEvmPNrdntYE2HQ8dF3ib4Wi9/Tx77drzrWw==", "requires": { "@grpc/grpc-js": "^1.11.1", "@grpc/proto-loader": "^0.7.7", diff --git a/vscode/quint-vscode/server/package.json b/vscode/quint-vscode/server/package.json index 67ce021b6..143cbe1ed 100644 --- 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"