From bcfa026805a4d993f1a7fdd72ec53840fb9e8316 Mon Sep 17 00:00:00 2001 From: "Isaac J. Newton" Date: Sun, 15 Nov 2026 21:26:12 +0000 Subject: [PATCH 1/2] test: wait for desktop layout reset to complete --- tests/ui/desktop.spec.cjs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/ui/desktop.spec.cjs b/tests/ui/desktop.spec.cjs index ba61cd2..4b6415a 100644 --- a/tests/ui/desktop.spec.cjs +++ b/tests/ui/desktop.spec.cjs @@ -98,8 +98,12 @@ test('manual mouse drag swaps occupied cells, suppresses launching, persists, an await page.getByRole('button', { name: 'Keep my layout' }).click(); expect(await page.evaluate(() => Desktop.getPreferences().mode)).toBe('manual'); await page.locator('#reset-layout').click(); - await page.getByRole('button', { name: 'Reset layout', exact: true }).last().click(); - expect(await page.evaluate(() => Desktop.getPreferences())).toMatchObject({ mode: 'auto', positions: {} }); + await page.locator('#reset-dialog').getByRole('button', { name: 'Reset layout', exact: true }).click(); + // The native dialog dispatches its close event asynchronously after the click. + await expect.poll(() => page.evaluate(() => { + const { mode, positions } = Desktop.getPreferences(); + return { mode, positions }; + })).toEqual({ mode: 'auto', positions: {} }); await page.locator('input[value="manual"]').check(); await page.locator('#reset-layout').click(); await page.keyboard.press('Escape'); From fc1eed0cac0573d12219db0fc2de11e270bc0c6f Mon Sep 17 00:00:00 2001 From: "Isaac J. Newton" Date: Sun, 15 Nov 2026 21:57:44 +0000 Subject: [PATCH 2/2] fix: repair dependency lockfile and modernize CI workflow --- .github/workflows/ci.yml | 57 +++++++++++++++++++++----------------- package-lock.json | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 835ac6d..c7b9a37 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,15 +21,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v6 with: node-version: "20" - name: Install dependencies - run: npm install + run: npm ci --include=dev - name: Run tests run: npm test @@ -43,6 +43,7 @@ jobs: build-platform: needs: [test] strategy: + fail-fast: false matrix: include: - platform: linux/amd64 @@ -60,25 +61,26 @@ jobs: - name: Normalize image names run: | - echo "CONSOLE_IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV + echo "CONSOLE_IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV" - name: Free disk space uses: jlumbroso/free-disk-space@main with: - tool-cache: true + preinstalled-runtimes: true android: true dotnet: true haskell: true - large-packages: true + # Package availability differs between the AMD64 and ARM64 runners. + large-packages: false docker-images: true swap-storage: true - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Log in to GitHub Container Registry if: github.event_name != 'pull_request' - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -87,14 +89,14 @@ jobs: # Console image - push by digest with repository name - name: Build Console image (single platform) id: build-console - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . platforms: ${{ matrix.platform }} push: ${{ github.event_name != 'pull_request' }} outputs: type=image,name=${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }},push-by-digest=true cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }}:buildcache-${{ matrix.arch }} - cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }}:buildcache-${{ matrix.arch }},mode=max + cache-to: ${{ github.event_name != 'pull_request' && format('type=registry,ref={0}/{1}:buildcache-{2},mode=max', env.REGISTRY, env.CONSOLE_IMAGE_NAME, matrix.arch) || '' }} - name: Save digests to files if: github.event_name != 'pull_request' @@ -103,7 +105,7 @@ jobs: - name: Upload digests artifact if: github.event_name != 'pull_request' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: digests-${{ matrix.arch }} path: | @@ -117,41 +119,44 @@ jobs: steps: - name: Normalize image names run: | - echo "CONSOLE_IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV + echo "CONSOLE_IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV" - name: Download all digests - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v7 with: pattern: digests-* merge-multiple: true - name: Log in to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Extract metadata for Console image id: meta-console - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }} - name: Create multi-arch manifest for Console + env: + IMAGE_TAGS: ${{ steps.meta-console.outputs.tags }} run: | AMD64_DIGEST=$(cat digests-amd64-console-digest.txt) ARM64_DIGEST=$(cat digests-arm64-console-digest.txt) - echo AMD64_DIGEST=$AMD64_DIGEST - echo ARM64_DIGEST=$ARM64_DIGEST - TAGS=(${{ steps.meta-console.outputs.tags }}) - TAG_ARGS="" - for tag in "${TAGS[@]}"; do - TAG_ARGS="$TAG_ARGS --tag $tag" - done - docker buildx imagetools create $TAG_ARGS \ - ${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }}@$AMD64_DIGEST \ - ${{ env.REGISTRY }}/${{ env.CONSOLE_IMAGE_NAME }}@$ARM64_DIGEST + echo "AMD64_DIGEST=$AMD64_DIGEST" + echo "ARM64_DIGEST=$ARM64_DIGEST" + TAG_ARGS=() + while IFS= read -r tag; do + if [[ -n "$tag" ]]; then + TAG_ARGS+=(--tag "$tag") + fi + done <<< "$IMAGE_TAGS" + docker buildx imagetools create "${TAG_ARGS[@]}" \ + "$REGISTRY/$CONSOLE_IMAGE_NAME@$AMD64_DIGEST" \ + "$REGISTRY/$CONSOLE_IMAGE_NAME@$ARM64_DIGEST" diff --git a/package-lock.json b/package-lock.json index e64ffc5..ce27e38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2171,6 +2171,21 @@ "xstream": "^11.14.0" } }, + "node_modules/@cosmjs/socket/node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/@cosmjs/socket/node_modules/ws": { "version": "7.5.10", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", @@ -3090,6 +3105,21 @@ "ws": "7.4.6" } }, + "node_modules/@ethersproject/providers/node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/@ethersproject/providers/node_modules/ws": { "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", @@ -9958,6 +9988,21 @@ "ws": "^7.5.1" } }, + "node_modules/@walletconnect/jsonrpc-ws-connection/node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/@walletconnect/jsonrpc-ws-connection/node_modules/ws": { "version": "7.5.10", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", @@ -14580,6 +14625,21 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "license": "MIT" }, + "node_modules/jayson/node_modules/utf-8-validate": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", + "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">=6.14.2" + } + }, "node_modules/jayson/node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",