From 2c7f6db742f80103a6fc4998f2eea20572287a52 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Fri, 25 Apr 2025 13:39:01 -0400 Subject: [PATCH 1/2] fix: make CI pass on 2025.2 Fixes #778 Solution (in theory) is just to purge cached queries so we aren't stuck with stale queries in the container when it boots. --- .github/workflows/images.yml | 5 ----- iris.script | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index f24f9ecc..866d3fd8 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -34,11 +34,6 @@ jobs: then continue fi - # Skip latest-preview due to #778 - if [ "$tag" = "latest-preview" ]; - then - continue - fi images+='"'${n}:${tag}'",'; done done; diff --git a/iris.script b/iris.script index f417d5e9..9130b738 100644 --- a/iris.script +++ b/iris.script @@ -2,6 +2,7 @@ do $System.OBJ.Load("/home/irisowner/zpm/preload/cls/IPM/Installer.cls","ck") do ##class(IPM.Installer).setup("/home/irisowner/zpm/",3) zpm "repo -r -name registry -url https://pm.community.intersystems.com/" + do $System.SQL.PurgeAllNamespaces() halt // Currently broken for %IPM due to differing default behavior for packages starting with % - vscode-per-namespace-settings passes through as-is, IPM expects to strip %. From 7a6a453d51ef4b6ab452a48746798f811b01b05a Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Fri, 25 Apr 2025 13:40:22 -0400 Subject: [PATCH 2/2] docs: add changelog, bump version --- CHANGELOG.md | 5 +++++ module.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01a01143..3e8abb44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.10.2] - Unreleased + +### Fixed +- #778 CI - avoid deadlock on 2025.2 preview due to cached query regeneration bug + ## [0.10.1] - 2024-04-24 ### Fixed diff --git a/module.xml b/module.xml index cd041a5b..00537fd3 100644 --- a/module.xml +++ b/module.xml @@ -2,7 +2,7 @@ ZPM - 0.10.1-SNAPSHOT + 0.10.2-SNAPSHOT IPM InterSystems Package Manager (IPM) provides development tools and infrastructure for defining, building, distributing, and installing modules and applications. Package Manager