From b2a4714221dc6b369ce1854b6947736f7fbb985a Mon Sep 17 00:00:00 2001 From: Etienne Lescot Date: Wed, 19 Aug 2026 00:07:47 +0200 Subject: [PATCH 1/2] chore(release): set main to 1.9.6 v1.9.6 is tagged and building; main was still declaring 1.9.5. Same move as `a0eca303 chore(release): set main to 1.9.5` after the previous release, and written by the same script promote.yml uses (.github/scripts/set-release-version.mjs), so package-lock.json is updated alongside package.json rather than left behind. This exists as its own commit because the sync PR that promote.yml opened (#392) cannot do the job. That branch was cut from the v1.9.5 TAG, whose content main already carries under different SHAs from the earlier rebase-merge, so the PR carries 39 commits of which 23 are duplicates -- which is why the rebase-merge failed five times. Worse, its net diff against main is a reversion: 1889 deletions taking out the whole updater stack (auto-updater, install-channel, update-checker, mac-update-feed), the editor's OpenProjectModal test, and 111 lines of build.yml -- everything that landed on main after v1.9.5 and was deliberately kept out of the 1.9.6 patch release. The conflict was load-bearing. Closing #392 rather than merging it; this is the only part of it main wants. --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 16fc629b..e0ea6e09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openscreen", - "version": "1.9.5", + "version": "1.9.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openscreen", - "version": "1.9.5", + "version": "1.9.6", "dependencies": { "@fix-webm-duration/fix": "^1.0.1", "@langchain/anthropic": "^1.3.26", diff --git a/package.json b/package.json index 7a22a8d3..67cd2585 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "openscreen", "private": true, - "version": "1.9.5", + "version": "1.9.6", "type": "module", "packageManager": "npm@10.9.4", "engines": { From 6cfbcfdd739dac700e8a293de70b6ee034e33b0c Mon Sep 17 00:00:00 2001 From: Etienne Lescot Date: Wed, 19 Aug 2026 00:39:12 +0200 Subject: [PATCH 2/2] fix(nix): refresh npmDepsHash for the 1.9.6 lockfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping the version rewrites package-lock.json, which is exactly what invalidates this hash — nix-check.yml went red on the version commit and printed the value to use: recorded in nix/package.nix: sha256-1fer91zZlZxC5SoIj3F/bNcLoD+Q+QxLpCZF067Upko= expected from package-lock.json: sha256-Vr6Sw/WKmX22eT4a22+Xr3/miMzZr2uAwiYx12toU/E= Folded into this PR rather than left for the automation: bump-nix-package.yml ran green on the v1.9.6 release but opened no PR (it can only push a branch — the PR needs a token GITHUB_TOKEN does not have), so nothing was coming to fix it, and merging the bump alone would have left main red. --- nix/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/package.nix b/nix/package.nix index 91cf68e9..90bd895a 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -37,7 +37,7 @@ buildNpmPackage { ); }; - npmDepsHash = "sha256-1fer91zZlZxC5SoIj3F/bNcLoD+Q+QxLpCZF067Upko="; + npmDepsHash = "sha256-Vr6Sw/WKmX22eT4a22+Xr3/miMzZr2uAwiYx12toU/E="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";