Skip to content

Commit

Permalink
feat: kubo 0.29 and native apple silicon (#1856)
Browse files Browse the repository at this point in the history
* refactor: macos universal build
* refactor: switch to macos-latest (arm)
* feat(macos): build universal kubo binary
* fix(ci): switch back to lts node

This also tests  ipfs/npm-kubo#74
removing the need for hack from #2662

* chore: remove coactions/setup-xvfb

modern linux image at github includes it out of the box
and we use xvfb-maybe internally to use it when appropriate

* chore: update .github/CODEOWNERS
* chore: kubo v0.29.0
* chore: electron-updater

bumping to include:
windows fix: https://github.com/electron-userland/electron-builder/releases/tag/electron-updater%406.1.9
macos fix: https://github.com/electron-userland/electron-builder/releases/tag/electron-updater%406.2.1

* chore: ensure release as 0.36.0

Release-As: 0.36.0
Co-authored-by: Russell Dempsey <[email protected]>
  • Loading branch information
lidel and SgtPooki authored Jun 12, 2024
1 parent 6580094 commit 0cd87ab
Show file tree
Hide file tree
Showing 6 changed files with 1,541 additions and 438 deletions.
10 changes: 9 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,12 @@
# these owners will be requested for review when someone
# opens a pull request.
# All GUI Teams: @ipfs-shipyard/ipfs-gui @ipfs-shipyard/gui @ipfs/gui-dev @ipfs/wg-gui-ux
* @ipfs/gui-dev @sgtpooki @whizzzkid
* @ipfs/gui-dev @sgtpooki

# Explicit ping when changes impact build and release pipeline
electron-builder.yml @lidel
release-please-config.json @lidel
pkgs/ @lidel
.github/workflows/ci.yml @lidel
src/auto-updater/ @lidel

15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '18.17.1'
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13, ubuntu-latest, windows-latest]
os: [macos-latest, ubuntu-latest, windows-latest]

steps:
- name: Check out Git repository
Expand All @@ -87,7 +87,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '18.17.1'
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
Expand Down Expand Up @@ -131,10 +131,7 @@ jobs:
run: npm run test

- name: Test end-to-end
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
with:
working-directory: ${{ github.workspace }}
run: npm run test:e2e
run: npm run test:e2e

- name: Lint
run: npm run lint
Expand All @@ -145,7 +142,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13, ubuntu-latest, windows-latest]
os: [macos-latest, ubuntu-latest, windows-latest]

steps:
- name: Check out Git repository
Expand All @@ -154,7 +151,7 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: '18.17.1'
node-version: 'lts/*'

- name: Read ipfs-webui CID from package.json
id: read-webui-version
Expand Down
4 changes: 2 additions & 2 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ mac:
entitlements: './pkgs/macos/entitlements.mac.plist'
entitlementsInherit: './pkgs/macos/entitlements.mac.plist'
target:
- zip
- dmg
- target: default
arch: ['universal']

dmg:
artifactName: ${name}-${version}-mac.${ext}
Expand Down
Loading

0 comments on commit 0cd87ab

Please sign in to comment.