From 68b76cb6223f0b1bf0c48f542422306296ea81ae Mon Sep 17 00:00:00 2001 From: zhaoyulin <92558550+alphabiz-se4@users.noreply.github.com> Date: Fri, 13 Sep 2024 15:54:42 +0800 Subject: [PATCH] skip e2e --- .github/workflows/release-nightly.yml | 28 +++++++++++++++++++-------- release.json | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index fb094fcf..581193bd 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -115,6 +115,11 @@ jobs: fi shell: bash + - uses: actions/setup-python@v5 + if: runner.os == 'macOS' + with: + python-version: '3.8' + - name: Setup Node.js ${{ matrix.node-version }} ๐Ÿ“ฎ uses: actions/setup-node@v3 with: @@ -134,7 +139,7 @@ jobs: echo "package=${{ steps.slug.outputs.display-name }}-linux-x64" >> $GITHUB_OUTPUT ; \ elif [[ ${{ matrix.os }} = "macos-latest" ]] ; \ then echo "system=macos" >> $GITHUB_OUTPUT ; \ - echo "package=${{ steps.slug.outputs.display-name }}-darwin-x64" >> $GITHUB_OUTPUT ; \ + echo "package=${{ steps.slug.outputs.display-name }}-darwin-arm64" >> $GITHUB_OUTPUT ; \ elif [[ ${{ matrix.os }} = "windows-latest" ]] ; \ then echo "system=windows" >> $GITHUB_OUTPUT ; \ echo "package=${{ steps.slug.outputs.display-name }}-win32-x64" >> $GITHUB_OUTPUT ; \ @@ -310,12 +315,12 @@ jobs: Set-DisplayResolution -Width 1920 -Height 1080 -Force shell: powershell - - name: screen resolution(For Mac) - if: runner.os == 'macOS' - run: | - system_profiler SPDisplaysDataType | grep Resolution - "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440 - system_profiler SPDisplaysDataType | grep Resolution + # - name: screen resolution(For Mac) + # if: runner.os == 'macOS' + # run: | + # system_profiler SPDisplaysDataType | grep Resolution + # "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440 + # system_profiler SPDisplaysDataType | grep Resolution - name: main E2E Test for Electron ๐Ÿงช if: "!contains(github.event.head_commit.message, 'skip e2e')" @@ -486,7 +491,14 @@ jobs: xcrun notarytool submit "$SIGNED_DMG" -v --apple-id "$APPLE_ID" --password "$APPLE_ASP" --team-id "$APPLE_TEAM_ID" -f json --wait xcrun stapler staple "$SIGNED_DMG" echo "Finish notarizing dmg" - + + - name: check + if: runner.os == 'macOS' + run: | + ls + echo "------------------------" + ls ./dist/electron + - name: Package for ${{ steps.vars.outputs.system }}-${{ steps.unify.outputs.tag-name }} Release ๐Ÿ—œ๏ธ if: contains(steps.vars.outputs.event-name, 'schedule') || contains(env.MODIFIED_FILE_LIST, 'release.json') run: 7z a -t7z -mx=9 "./out/installers/${{ steps.unify.outputs.tag-name }}/${{ steps.slug.outputs.file-name-lower }}-${{ steps.unify.outputs.package-name }}-${{ steps.vars.outputs.system }}.7z" "./dist/electron/${{ steps.vars.outputs.package }}" diff --git a/release.json b/release.json index ec01901e..9f6ad95d 100644 --- a/release.json +++ b/release.json @@ -1,4 +1,4 @@ { "targetTagName": "main", - "newTagName": "0.3.2" + "newTagName": "0.3.3" } \ No newline at end of file