From b7d99e1d8b1a32a017b4560409f31946e7929663 Mon Sep 17 00:00:00 2001 From: neil Date: Wed, 4 Jan 2023 11:55:13 +0800 Subject: [PATCH] #114 improve gha comments --- .github/workflows/ci.yml | 61 ++++++++++++++++---------------- .github/workflows/m1.yml | 75 ---------------------------------------- 2 files changed, 29 insertions(+), 107 deletions(-) delete mode 100644 .github/workflows/m1.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e297a23..0ddf3b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,8 @@ jobs: with: message-id: preview-comment-${{needs.changes.outputs.preview_folder}} message: | - **preview is at**: [https://${{steps.preview_setup.outputs.domain}}](https://${{steps.preview_setup.outputs.domain}}) + **preview is at**: + here ```bash https://${{steps.preview_setup.outputs.domain}} ``` @@ -183,12 +184,6 @@ jobs: echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - # - uses: apple-actions/import-codesign-certs@d54750db52a4d3eaed0fc107a8bab3958f3f7494 - # if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - # with: - # p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }} - # p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} - - name: test build tauri for MacOS if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' # FROM: https://tauri.app/v1/guides/distribution/sign-macos @@ -207,22 +202,8 @@ jobs: # TODO: https://tauri.app/v1/guides/distribution/sign-linux run: pnpm build:gui - # - name: Codesign package - # if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - # env: - # APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - # run: | - # codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/macos/tea.app || true - # codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_aarch64.dmg || true - - # - name: clean package for preview - # if: matrix.platform.name == 'darwin+aarch64' - # run: | - # xattr -d com.apple.quarantine ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_aarch64.dmg - # xattr -d com.apple.quarantine ./modules/gui/src-tauri/target/release/bundle/macos/tea.app - - - name: zip app - if: matrix.platform.name == 'darwin+aarch64' + - name: zip .app for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' run: | cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app @@ -242,24 +223,40 @@ jobs: aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ "s3://preview.gui.tea.xyz/$prefix/gui_$platform.$extension" - - name: cp package zip - if: matrix.platform.name == 'darwin+aarch64' + - name: cp package zip for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' env: prefix: ${{ needs.changes.outputs.preview_folder }} + platform: ${{ steps.build_platform.outputs.build_platform }} run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_m1.zip" + aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/$prefix/tea_$platform.zip" - # - name: Delete keychain - # if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - # run: security delete-keychain signing_temp.keychain - - - name: comment install + - name: comment install for Linux + if: matrix.platform.name == 'linux+x86-64' uses: mshick/add-pr-comment@v2 with: message-id: ${{ matrix.platform.name }}-comment message: | - **installer for ${{ matrix.platform.name }} is at**: [here](http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/gui_${{steps.build_platform.outputs.build_platform}}.${{steps.build_platform.outputs.extension}}) + **installer for Linux ${{ matrix.platform.name }} is at**: + here + ```bash http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/gui_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }} ``` + copy-paste into a browser to download + - name: comment install for MacOS + if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + uses: mshick/add-pr-comment@v2 + with: + message-id: ${{ matrix.platform.name }}-comment + message: | + **installers for MacOS ${{ matrix.platform.name }} is at**: + .zip + or + .dmg + + ```bash + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/gui_${{ steps.build_platform.outputs.build_platform }}.zip + http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/${{ needs.changes.outputs.preview_folder }}/gui_${{ steps.build_platform.outputs.build_platform }}.dmg + ``` copy-paste into a browser to download \ No newline at end of file diff --git a/.github/workflows/m1.yml b/.github/workflows/m1.yml deleted file mode 100644 index 1df199f..0000000 --- a/.github/workflows/m1.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: "deploy" - -on: - push: - branches: - - m1-codesign-x - - -jobs: - build_tauri: - timeout-minutes: 6 - runs-on: ${{ matrix.platform.os }} - strategy: - matrix: - platform: - # - os: macos-11 - # name: darwin+x86-64 - # - os: ubuntu-latest - # name: linux+x86-64 - - os: [self-hosted, macOS, ARM64] - name: darwin+aarch64 - # - os: [self-hosted, linux, ARM64] - # name: linux+aarch64 - container: ${{ matrix.platform.container }} - steps: - - uses: actions/checkout@v2 - - name: setup node - uses: actions/setup-node@v2 - with: - node-version: 16 - - name: install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - uses: pnpm/action-setup@v2 - with: - version: 7.18.2 - run_install: true - - - uses: apple-actions/import-codesign-certs@d54750db52a4d3eaed0fc107a8bab3958f3f7494 - with: - p12-file-base64: ${{ secrets.APPLE_CERTIFICATE_P12 }} - p12-password: ${{ secrets.APPLE_CERTIFICATE_P12_PASSWORD }} - - run: pnpm build:gui - - # - name: Codesign package - # run: | - # codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/macos/tea.app || true - # codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" -v --force --deep --timestamp --preserve-metadata=entitlements -o runtime ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_aarch64.dmg || true - - - name: Codesign package .app only - run: | - codesign -s "Developer ID Application: Tea Inc. (7WV56FL599)" --force ./modules/gui/src-tauri/target/release/bundle/macos/tea.app - - - name: zip app - run: | - cd ./modules/gui/src-tauri/target/release/bundle/macos/ && zip -r tea.zip tea.app - - - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-east-1 - - # - name: cp package images from prod to preview bucket - # run: | - # aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea_m1.zip" - # aws s3 cp ./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_aarch64.dmg "s3://preview.gui.tea.xyz/release/tea_m1.dmg" - - name: cp package images from prod to preview bucket - run: | - aws s3 cp ./modules/gui/src-tauri/target/release/bundle/macos/tea.zip "s3://preview.gui.tea.xyz/release/tea_m1_simplified.zip" - - - name: Delete keychain - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' - run: security delete-keychain signing_temp.keychain