Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the CD GitHub Actions workflow in response to bun gaining Windows ARM support, aiming to simplify the Windows ARM setup path during releases.
Changes:
- Limits the release job matrix to Windows ARM only (other OS/arch entries are commented out).
- Removes Windows ARM-specific bun installation and dependency install flags, using
oven-sh/setup-bun@v2uniformly. - Comments out the
web_appdeployment job and thenpmpublish job.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
19
to
+31
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - name: Windows (Intel) | ||
| os: windows-2022 | ||
| # - name: Windows (Intel) | ||
| # os: windows-2022 | ||
| - name: Windows (ARM) | ||
| os: windows-11-arm | ||
| - name: Linux (Intel) | ||
| os: ubuntu-22.04 | ||
| - name: Linux (ARM) | ||
| os: ubuntu-22.04-arm | ||
| - name: macOS (Intel) | ||
| os: macos-15-intel | ||
| - name: macOS (ARM) | ||
| os: macos-15 | ||
| # - name: Linux (Intel) | ||
| # os: ubuntu-22.04 | ||
| # - name: Linux (ARM) | ||
| # os: ubuntu-22.04-arm | ||
| # - name: macOS (Intel) | ||
| # os: macos-15-intel |
There was a problem hiding this comment.
The release matrix has been reduced to only "Windows (ARM)" by commenting out Windows/Linux/macOS Intel/ARM entries. This will stop producing release artifacts for the other platforms; if the intent is to add Windows ARM support, keep the other matrix entries enabled (or move them behind an explicit flag/condition) so CD still builds the full set of releases.
Comment on lines
87
to
+131
| - name: Release OpenCOR | ||
| run: bun release | ||
| web_app: | ||
| if: ${{ github.repository == 'opencor/webapp' }} | ||
| name: Web app | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Set the timezone to New Zealand | ||
| uses: szenius/set-timezone@v2.0 | ||
| with: | ||
| timezoneLinux: 'Pacific/Auckland' | ||
| - name: Check out OpenCOR | ||
| uses: actions/checkout@v4 | ||
| - name: Install Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 'lts/*' | ||
| - name: Install bun | ||
| run: npm install -g bun | ||
| - name: OpenCOR dependencies | ||
| run: bun install | ||
| - name: Build OpenCOR's Web app | ||
| env: | ||
| VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY }} | ||
| VITE_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.VITE_FIREBASE_MESSAGING_SENDER_ID }} | ||
| VITE_FIREBASE_APP_ID: ${{ secrets.VITE_FIREBASE_APP_ID }} | ||
| VITE_FIREBASE_MEASUREMENT_ID: ${{ secrets.VITE_FIREBASE_MEASUREMENT_ID }} | ||
| run: bun build:web | ||
| - name: Deploy to https://opencor.ws/app/ | ||
| uses: milanmk/actions-file-deployer@master | ||
| with: | ||
| remote-protocol: sftp | ||
| remote-host: ${{ secrets.REMOTE_HOST }} | ||
| remote-user: ${{ secrets.REMOTE_USER }} | ||
| ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} | ||
| local-path: ./src/renderer/dist | ||
| remote-path: /home/www/opencor.ws/app | ||
| sync: full | ||
| - name: Archive OpenCOR's Web app | ||
| run: bun archive:web | ||
| - name: Release OpenCOR's Web app | ||
| uses: softprops/action-gh-release@v2 | ||
| with: | ||
| files: dist/OpenCOR-*-WebApp.tar.gz | ||
| npm: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Set the timezone to New Zealand | ||
| uses: szenius/set-timezone@v2.0 | ||
| with: | ||
| timezoneLinux: 'Pacific/Auckland' | ||
| - name: Check out OpenCOR | ||
| uses: actions/checkout@v4 | ||
| - name: Install Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 'lts/*' | ||
| registry-url: 'https://registry.npmjs.org' | ||
| - name: Update npm | ||
| # Install the latest version of npm since we need npm 11.5.1 or later to publish to npm using OIDC (see | ||
| # https://docs.npmjs.com/trusted-publishers). | ||
| run: npm install -g npm@latest | ||
| - name: Install bun | ||
| run: npm install -g bun | ||
| - name: OpenCOR dependencies | ||
| run: | | ||
| cd src/renderer | ||
| bun install | ||
| - name: Build OpenCOR as a component | ||
| env: | ||
| VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY }} | ||
| VITE_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.VITE_FIREBASE_MESSAGING_SENDER_ID }} | ||
| VITE_FIREBASE_APP_ID: ${{ secrets.VITE_FIREBASE_APP_ID }} | ||
| VITE_FIREBASE_MEASUREMENT_ID: ${{ secrets.VITE_FIREBASE_MEASUREMENT_ID }} | ||
| run: | | ||
| cd src/renderer | ||
| bun build:lib | ||
| - name: Publish OpenCOR | ||
| # bun cannot currently be used to publish to npm using OIDC (see https://github.com/oven-sh/bun/issues/22423 and | ||
| # https://github.com/oven-sh/bun/issues/15601), so we use npm instead. To publish using OIDC implies automatic | ||
| # provenance generation, so no need to specify --provenance (see https://docs.npmjs.com/trusted-publishers). | ||
| # Provenance requires "repository.url" in package.json to match the repository from which we are publishing. In | ||
| # our case, it means that we can only publish to npm from the "opencor/webapp" repository. (Provenance can be | ||
| # disabled, but we prefer to be open.) | ||
| run: | | ||
| cd src/renderer | ||
| npm publish --access public --no-git-checks | ||
| # web_app: | ||
| # if: ${{ github.repository == 'opencor/webapp' }} | ||
| # name: Web app | ||
| # runs-on: ubuntu-22.04 | ||
| # steps: | ||
| # - name: Set the timezone to New Zealand | ||
| # uses: szenius/set-timezone@v2.0 | ||
| # with: | ||
| # timezoneLinux: 'Pacific/Auckland' | ||
| # - name: Check out OpenCOR | ||
| # uses: actions/checkout@v4 | ||
| # - name: Install Node.js | ||
| # uses: actions/setup-node@v4 | ||
| # with: | ||
| # node-version: 'lts/*' | ||
| # - name: Install bun | ||
| # run: npm install -g bun | ||
| # - name: OpenCOR dependencies | ||
| # run: bun install | ||
| # - name: Build OpenCOR's Web app | ||
| # env: | ||
| # VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY }} | ||
| # VITE_FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.VITE_FIREBASE_MESSAGING_SENDER_ID }} | ||
| # VITE_FIREBASE_APP_ID: ${{ secrets.VITE_FIREBASE_APP_ID }} | ||
| # VITE_FIREBASE_MEASUREMENT_ID: ${{ secrets.VITE_FIREBASE_MEASUREMENT_ID }} | ||
| # run: bun build:web | ||
| # - name: Deploy to https://opencor.ws/app/ | ||
| # uses: milanmk/actions-file-deployer@master | ||
| # with: | ||
| # remote-protocol: sftp | ||
| # remote-host: ${{ secrets.REMOTE_HOST }} | ||
| # remote-user: ${{ secrets.REMOTE_USER }} | ||
| # ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} | ||
| # local-path: ./src/renderer/dist | ||
| # remote-path: /home/www/opencor.ws/app | ||
| # sync: full | ||
| # - name: Archive OpenCOR's Web app | ||
| # run: bun archive:web | ||
| # - name: Release OpenCOR's Web app | ||
| # uses: softprops/action-gh-release@v2 | ||
| # with: | ||
| # files: dist/OpenCOR-*-WebApp.tar.gz | ||
| # npm: |
There was a problem hiding this comment.
The "web_app" and "npm" jobs have been entirely commented out. That effectively disables web app deployment and npm publishing from this workflow; if this is intentional, it should be removed or guarded behind an explicit if:/input rather than left as a large commented block, and the PR title/description should reflect the behavior change.
Comment on lines
77
to
78
| sudo apt install libopenjp2-tools | ||
| - name: OpenCOR dependencies |
There was a problem hiding this comment.
CD now installs bun via oven-sh/setup-bun@v2 on Windows ARM and runs bun install without --cpu=arm64, while the CI workflow still uses a Windows ARM workaround (manual bun install + bun install --cpu=arm64). This inconsistency can lead to different dependency resolution/build outputs between CI and release; consider updating both workflows together (either remove the workaround everywhere or keep the same ARM-specific install flags in CD).
Suggested change
| sudo apt install libopenjp2-tools | |
| - name: OpenCOR dependencies | |
| sudo apt install libopenjp2-tools | |
| - name: OpenCOR dependencies (Windows ARM) | |
| if: ${{ matrix.name == 'Windows (ARM)' }} | |
| run: bun install --cpu=arm64 | |
| - name: OpenCOR dependencies | |
| if: ${{ matrix.name != 'Windows (ARM)' }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.