From 6061334b713e3e086d3ec10bb8053c6ac600f18f Mon Sep 17 00:00:00 2001 From: bugarela Date: Thu, 19 Sep 2024 14:10:39 -0300 Subject: [PATCH 1/6] Bump Apalache to 0.45.6 --- CHANGELOG.md | 5 +++++ quint/src/apalache.ts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc77355af..333b88aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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) + ### Security ## v0.22.0 -- 2024-09-09 diff --git a/quint/src/apalache.ts b/quint/src/apalache.ts index dfd930eba..54e6205fd 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.45.6' // TODO: used by GitHub api approach: https://github.com/informalsystems/quint/issues/1124 // const APALACHE_TGZ = 'apalache.tgz' From 4ff8b068a2062d59a4e8bfa0208fff8a04ff0088 Mon Sep 17 00:00:00 2001 From: Gabriela Moreira Date: Tue, 24 Sep 2024 11:50:16 -0300 Subject: [PATCH 2/6] Bump apalache to 0.46.1 --- quint/src/apalache.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quint/src/apalache.ts b/quint/src/apalache.ts index 54e6205fd..94aaa2f7a 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.45.6' +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' From c06712d639d6fe4b3afc67e7f2d552a995b55c3b Mon Sep 17 00:00:00 2001 From: bugarela Date: Wed, 25 Sep 2024 09:39:41 -0300 Subject: [PATCH 3/6] Release v0.22.1 --- CHANGELOG.md | 9 +++++++++ quint/package-lock.json | 4 ++-- quint/package.json | 2 +- quint/src/version.ts | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 333b88aa2..83583df8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## UNRELEASED +### Added +### Changed +### Deprecated +### Removed +### Fixed +### Security + +## v0.22.1 -- 2024-09-25 + ### Added ### Changed ### Deprecated 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/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' From c778466cef3bf33e424900f174bf98254e2895fd Mon Sep 17 00:00:00 2001 From: bugarela Date: Wed, 25 Sep 2024 13:38:51 -0300 Subject: [PATCH 4/6] VSCode Release v0.14.6 --- vscode/quint-vscode/CHANGELOG.md | 9 +++++++++ vscode/quint-vscode/package-lock.json | 4 ++-- vscode/quint-vscode/package.json | 2 +- vscode/quint-vscode/server/package-lock.json | 18 +++++++++--------- vscode/quint-vscode/server/package.json | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) 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" From a0bc7c54d8a88ef39b22fa8640a5d6c3850165de Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 1 Oct 2024 14:20:37 +0200 Subject: [PATCH 5/6] make the apalache server terminate properly --- quint/src/apalache.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/quint/src/apalache.ts b/quint/src/apalache.ts index 94aaa2f7a..211bc38ae 100644 --- a/quint/src/apalache.ts +++ b/quint/src/apalache.ts @@ -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)) From 6c470545792a02c125efda0fdaac61cb8dbfb540 Mon Sep 17 00:00:00 2001 From: Igor Konnov Date: Tue, 1 Oct 2024 14:34:44 +0200 Subject: [PATCH 6/6] add a changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83583df8a..c9a32dc73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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