From 97d2397e43cd59e500e9a5d230bd5741d842b08f Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 10:01:13 +1300 Subject: [PATCH 1/3] New version. --- package.json | 2 +- src/renderer/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4ae26d70..70a60fe9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "url": "git+https://github.com/opencor/webapp.git" }, "type": "module", - "version": "0.20260304.2", + "version": "0.20260305.0", "engines": { "bun": ">=1.2.0" }, diff --git a/src/renderer/package.json b/src/renderer/package.json index e277fcfe..eb33204c 100644 --- a/src/renderer/package.json +++ b/src/renderer/package.json @@ -42,7 +42,7 @@ }, "./style.css": "./dist/opencor.css" }, - "version": "0.20260304.2", + "version": "0.20260305.0", "scripts": { "build": "vite build && bun scripts/generate.version.js", "build:lib": "vite build --config vite.lib.config.ts && bun scripts/copy.indexdts.js", From f2fa0a0e69439ac4a6d642722be2b0d7e3931210 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 10:01:57 +1300 Subject: [PATCH 2/3] Updated our dependencies. --- bun.lock | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bun.lock b/bun.lock index abc41eba..587b11fb 100644 --- a/bun.lock +++ b/bun.lock @@ -26,7 +26,7 @@ "@wasm-fmt/clang-format": "^22.1.0", "autoprefixer": "^10.4.27", "cmake-js": "^8.0.0", - "electron": "^40.6.1", + "electron": "^40.7.0", "electron-builder": "^26.8.1", "electron-conf": "^1.3.0", "electron-updater": "^6.8.3", @@ -38,7 +38,7 @@ "stylelint-config-standard": "^40.0.0", "tailwindcss": "^4.2.1", "tailwindcss-primeui": "^0.6.1", - "tar": "^7.5.9", + "tar": "^7.5.10", "typescript": "^5.9.3", "unplugin-vue-components": "^31.0.0", "vite": "^7.3.1", @@ -603,7 +603,7 @@ "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="], - "electron": ["electron@40.6.1", "", { "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^24.9.0", "extract-zip": "^2.0.1" }, "bin": { "electron": "cli.js" } }, "sha512-u9YfoixttdauciHV9Ut9Zf3YipJoU093kR1GSYTTXTAXqhiXI0G1A0NnL/f0O2m2UULCXaXMf2W71PloR6V9pQ=="], + "electron": ["electron@40.7.0", "", { "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^24.9.0", "extract-zip": "^2.0.1" }, "bin": { "electron": "cli.js" } }, "sha512-oQe76S/3V1rcb0+i45hAxnCH8udkRZSaHUNwglzNAEKbB94LSJ1qwbFo8+uRc2UsYZgCqSIMRcyX40GyOkD+Xw=="], "electron-builder": ["electron-builder@26.8.1", "", { "dependencies": { "app-builder-lib": "26.8.1", "builder-util": "26.8.1", "builder-util-runtime": "9.5.1", "chalk": "^4.1.2", "ci-info": "^4.2.0", "dmg-builder": "26.8.1", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "simple-update-notifier": "2.0.0", "yargs": "^17.6.2" }, "bin": { "electron-builder": "cli.js", "install-app-deps": "install-app-deps.js" } }, "sha512-uWhx1r74NGpCagG0ULs/P9Nqv2nsoo+7eo4fLUOB8L8MdWltq9odW/uuLXMFCDGnPafknYLZgjNX0ZIFRzOQAw=="], @@ -1159,7 +1159,7 @@ "tapable": ["tapable@2.3.0", "", {}, "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="], - "tar": ["tar@7.5.9", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg=="], + "tar": ["tar@7.5.10", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-8mOPs1//5q/rlkNSPcCegA6hiHJYDmSLEI8aMH/CdSQJNWztHC9WHNam5zdQlfpTwB9Xp7IBEsHfV5LKMJGVAw=="], "temp": ["temp@0.9.4", "", { "dependencies": { "mkdirp": "^0.5.1", "rimraf": "~2.6.2" } }, "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA=="], diff --git a/package.json b/package.json index 70a60fe9..e7e4f346 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@wasm-fmt/clang-format": "^22.1.0", "autoprefixer": "^10.4.27", "cmake-js": "^8.0.0", - "electron": "^40.6.1", + "electron": "^40.7.0", "electron-builder": "^26.8.1", "electron-conf": "^1.3.0", "electron-updater": "^6.8.3", @@ -87,7 +87,7 @@ "stylelint-config-standard": "^40.0.0", "tailwindcss": "^4.2.1", "tailwindcss-primeui": "^0.6.1", - "tar": "^7.5.9", + "tar": "^7.5.10", "typescript": "^5.9.3", "unplugin-vue-components": "^31.0.0", "vite": "^7.3.1" From 1e16f13a9bbd3a3e9156b0f9df022088f8ea78cb Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Thu, 5 Mar 2026 10:01:01 +1300 Subject: [PATCH 3/3] CI/CD: no need anymore to install bun manually on Windows ARM. Indeed, `oven-sh/setup-bun@v2` now supports Windows ARM. --- .github/workflows/cd.yml | 8 -------- .github/workflows/ci.yml | 8 -------- 2 files changed, 16 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index edf26625..520ead1a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -63,15 +63,7 @@ jobs: echo "CSC_KEY_PASSWORD=$(echo $MACOS_CSC_KEY_PASSWORD)" >> $GITHUB_ENV echo -n $DEVELOPER_ID_APPLICATION_CERTIFICATE_BASE64 | base64 -d > $MACOS_CSC_LINK - name: Install bun - if: ${{ matrix.name != 'Windows (ARM)' }} uses: oven-sh/setup-bun@v2 - - name: Install bun (Windows ARM only) - if: ${{ matrix.name == 'Windows (ARM)' }} - run: | - curl -L https://github.com/oven-sh/bun/releases/latest/download/bun-windows-aarch64.zip -o bun.zip - unzip -j bun.zip -d $env:USERPROFILE\.bun - del bun.zip - echo "$env:USERPROFILE\.bun" >> $env:GITHUB_PATH - name: Install libopenjp2-tools (Linux ARM only) if: ${{ matrix.name == 'Linux (ARM)' }} run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7073705d..da9dbfac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,15 +41,7 @@ jobs: - name: Install CMake and Ninja uses: lukka/get-cmake@latest - name: Install bun - if: ${{ matrix.name != 'Windows (ARM)' }} uses: oven-sh/setup-bun@v2 - - name: Install bun (Windows ARM only) - if: ${{ matrix.name == 'Windows (ARM)' }} - run: | - curl -L https://github.com/oven-sh/bun/releases/latest/download/bun-windows-aarch64.zip -o bun.zip - unzip -j bun.zip -d $env:USERPROFILE\.bun - del bun.zip - echo "$env:USERPROFILE\.bun" >> $env:GITHUB_PATH - name: OpenCOR dependencies run: bun install - name: Build OpenCOR