From 42374f9fc4adf32a0e88f0048c583bd357484b3f Mon Sep 17 00:00:00 2001 From: himself65 Date: Sat, 6 May 2023 17:58:56 -0500 Subject: [PATCH 1/4] build: support linux arm64 --- .github/workflows/release-desktop-app.yml | 10 ++++++++++ apps/electron/package.json | 1 + 2 files changed, 11 insertions(+) diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index da77b8ebdaf85..8b3d0370d6112 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -124,12 +124,22 @@ jobs: run: yarn make-${{ matrix.spec.platform }}-${{ matrix.spec.arch }} working-directory: apps/electron + - name: make Linux (arm64) + if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} + run: yarn make-linux-arm64 + working-directory: apps/electron + - name: Save artifacts (mac) if: ${{ matrix.spec.platform == 'macos' }} run: | mkdir -p builds mv apps/electron/out/*/make/*.dmg ./builds/affine-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg mv apps/electron/out/*/make/zip/darwin/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip + - name: Save artifacts (linux arm64) + if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} + run: | + mkdir -p builds + mv apps/electron/out/*/make/zip/linux/arm64/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-linux-arm64.zip - name: Save artifacts (windows) if: ${{ matrix.spec.platform == 'windows' }} run: | diff --git a/apps/electron/package.json b/apps/electron/package.json index 2314d0da8cdee..d6ba642856fa8 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -15,6 +15,7 @@ "make-macos-x64": "electron-forge make --platform=darwin --arch=x64", "make-windows-x64": "electron-forge make --platform=win32 --arch=x64", "make-linux-x64": "electron-forge make --platform=linux --arch=x64", + "make-linux-arm64": "electron-forge make --platform=linux --arch=arm64", "rebuild:for-test": "yarn rebuild better-sqlite3", "rebuild:for-electron": "yarn electron-rebuild", "test": "playwright test" From 35f1e7ae228ef2f0ec7a82132903c1d030de5b9e Mon Sep 17 00:00:00 2001 From: himself65 Date: Sun, 7 May 2023 20:11:18 -0500 Subject: [PATCH 2/4] fix: update ci --- .github/workflows/release-desktop-app.yml | 6 +----- apps/electron/package.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 8b3d0370d6112..6298e647ae797 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -92,6 +92,7 @@ jobs: - { os: macos-latest, platform: macos, arch: x64 } - { os: macos-latest, platform: macos, arch: arm64 } - { os: ubuntu-latest, platform: linux, arch: x64 } + - { os: ubuntu-latest, platform: linux, arch: aarch64 } - { os: windows-latest, platform: windows, arch: x64 } runs-on: ${{ matrix.spec.os }} needs: before-make @@ -124,11 +125,6 @@ jobs: run: yarn make-${{ matrix.spec.platform }}-${{ matrix.spec.arch }} working-directory: apps/electron - - name: make Linux (arm64) - if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} - run: yarn make-linux-arm64 - working-directory: apps/electron - - name: Save artifacts (mac) if: ${{ matrix.spec.platform == 'macos' }} run: | diff --git a/apps/electron/package.json b/apps/electron/package.json index d6ba642856fa8..10192168f7233 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -15,7 +15,7 @@ "make-macos-x64": "electron-forge make --platform=darwin --arch=x64", "make-windows-x64": "electron-forge make --platform=win32 --arch=x64", "make-linux-x64": "electron-forge make --platform=linux --arch=x64", - "make-linux-arm64": "electron-forge make --platform=linux --arch=arm64", + "make-linux-aarch64": "electron-forge make --platform=linux --arch=arm64", "rebuild:for-test": "yarn rebuild better-sqlite3", "rebuild:for-electron": "yarn electron-rebuild", "test": "playwright test" From 43638a7e1149457b73eb4114b02ad96582e85e1f Mon Sep 17 00:00:00 2001 From: himself65 Date: Sun, 7 May 2023 20:23:50 -0500 Subject: [PATCH 3/4] fix: ci --- .github/workflows/release-desktop-app.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 6298e647ae797..624cd92e95bc0 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -131,11 +131,6 @@ jobs: mkdir -p builds mv apps/electron/out/*/make/*.dmg ./builds/affine-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.dmg mv apps/electron/out/*/make/zip/darwin/${{ matrix.spec.arch }}/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-macos-${{ matrix.spec.arch }}.zip - - name: Save artifacts (linux arm64) - if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} - run: | - mkdir -p builds - mv apps/electron/out/*/make/zip/linux/arm64/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-linux-arm64.zip - name: Save artifacts (windows) if: ${{ matrix.spec.platform == 'windows' }} run: | @@ -145,8 +140,14 @@ jobs: mv apps/electron/out/*/make/squirrel.windows/x64/*.msi ./builds/affine-${{ env.BUILD_TYPE }}-windows-x64.msi mv apps/electron/out/*/make/squirrel.windows/x64/*.nupkg ./builds/affine-${{ env.BUILD_TYPE }}-windows-x64.nupkg + - name: Save artifacts (linux arm64) + if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} + run: | + mkdir -p builds + mv apps/electron/out/*/make/zip/linux/arm64/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-linux-arm64.zip + - name: Save artifacts (linux) - if: ${{ matrix.spec.platform == 'linux' }} + if: ${{ matrix.spec.platform == 'linux' && matrix.spec.arch == 'x64' }} run: | mkdir -p builds mv apps/electron/out/*/make/zip/linux/x64/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-linux-x64.zip From 787b812141b6461c5bea9e8bcc1d252a06e54d95 Mon Sep 17 00:00:00 2001 From: himself65 Date: Sun, 7 May 2023 20:47:53 -0500 Subject: [PATCH 4/4] fix: ci --- .github/workflows/release-desktop-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-desktop-app.yml b/.github/workflows/release-desktop-app.yml index 624cd92e95bc0..d4949dba28d25 100644 --- a/.github/workflows/release-desktop-app.yml +++ b/.github/workflows/release-desktop-app.yml @@ -141,7 +141,7 @@ jobs: mv apps/electron/out/*/make/squirrel.windows/x64/*.nupkg ./builds/affine-${{ env.BUILD_TYPE }}-windows-x64.nupkg - name: Save artifacts (linux arm64) - if: ${{ matrix.spec.platform == 'macos' && matrix.spec.arch == 'arm64' }} + if: ${{ matrix.spec.platform == 'linux' && matrix.spec.arch == 'aarch64' }} run: | mkdir -p builds mv apps/electron/out/*/make/zip/linux/arm64/*.zip ./builds/affine-${{ env.BUILD_TYPE }}-linux-arm64.zip