From f6d911f278af35b007deec5e5422834df462d8c9 Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 27 Dec 2022 11:16:55 +0800 Subject: [PATCH] refactor code --- .github/workflows/ci.yml | 42 +++++++++----------------------------- .github/workflows/main.yml | 8 +++++--- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11b06c7..2a5e34e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,10 +174,13 @@ jobs: env: platform: ${{ matrix.platform.name }} run: | + EXTENSION=dmg BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM + [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT + echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - name: test build tauri run: pnpm --filter gui tauri build @@ -188,47 +191,22 @@ jobs: aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - - - name: mac-os cp package images from prod to preview bucket - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' + - name: cp package images from prod to preview bucket env: prefix: ${{ needs.changes.outputs.preview_folder }} platform: ${{ steps.build_platform.outputs.build_platform }} + extension: ${{ steps.build_platform.outputs.extension }} run: | - aws s3 cp "./modules/gui/src-tauri/target/release/bundle/dmg/tea_0.1.0_$platform.dmg" \ - "s3://preview.gui.tea.xyz/$prefix/gui_$platform.dmg" - - - - name: ubuntu cp package images from prod to preview bucket - if: matrix.platform.name == 'linux+x86-64' - 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/deb/tea_0.1.0_$platform.deb" \ - "s3://preview.gui.tea.xyz/$prefix/gui_$platform.deb" - - - name: comment install ubuntu - uses: mshick/add-pr-comment@v2 - if: matrix.platform.name == 'linux+x86-64' - 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}}.deb) - ```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}}.deb - ``` - copy-paste into a browser to download - + 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: comment install mac-os + - name: comment install uses: mshick/add-pr-comment@v2 - if: matrix.platform.name == 'darwin+x86-64' || matrix.platform.name == 'darwin+aarch64' 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}}.dmg) + **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}}) ```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 }}.dmg + 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 \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08441f5..7bae9cb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,17 +131,19 @@ jobs: platform: ${{ matrix.platform.name }} run: | BUILD_PLATFORM=$(echo $platform | sed -e "s/darwin+//g" | sed -e "s/linux+//g") + EXTENSION=dmg [[ $BUILD_PLATFORM = "x86-64" ]] && BUILD_PLATFORM="x64" || BUILD_PLATFORM=$BUILD_PLATFORM [[ $platform = "linux+x86-64" ]] && BUILD_PLATFORM="amd64" || BUILD_PLATFORM=$BUILD_PLATFORM + [[ $platform = "linux+x86-64" ]] && EXTENSION="deb" echo "build_platform=$BUILD_PLATFORM" >> $GITHUB_OUTPUT + echo "extension=$EXTENSION" >> $GITHUB_OUTPUT - name: cp package images from prod to gui bucket env: platform: ${{ steps.build_platform.outputs.build_platform }} build_platform: ${{ matrix.platform.name }} + extension: ${{steps.build_platform.outputs.extension}} run: | - extension=dmg - [[ $build_platform = "linux+x86-64" ]] && extension="deb" || extension="dmg" aws s3 cp "./modules/gui/src-tauri/target/release/bundle/$extension/tea_0.1.0_$platform.$extension" \ "s3://preview.gui.tea.xyz/release/tea_${{ steps.date.outputs.unix_seconds }}_$platform.$extension" @@ -150,4 +152,4 @@ jobs: env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} PLATFORM: ${{ matrix.platform.name }} - DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ matrix.platform.name == 'ubuntu-latest' && 'deb' || 'dmg'}} + DOWNLOAD_URL: http://preview.gui.tea.xyz.s3-website-us-east-1.amazonaws.com/release/tea_${{ steps.date.outputs.unix_seconds }}_${{ steps.build_platform.outputs.build_platform }}.${{ steps.build_platform.outputs.extension }}