Skip to content

Commit d18fb9d

Browse files
committed
skip e2e
1 parent 794327e commit d18fb9d

File tree

3 files changed

+31
-17
lines changed

3 files changed

+31
-17
lines changed

.github/workflows/release-nightly.yml

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
file-name-lower: ${{ steps.slug.outputs.file-name-lower }}
4141
strategy:
4242
matrix:
43-
os: [ubuntu-latest, macos-latest]
43+
os: [ubuntu-latest] # [ubuntu-latest, macos-latest-large]
4444
node-version: [16]
45-
include:
46-
- os: windows-latest
47-
node-version: 16
45+
# include:
46+
# - os: windows-latest
47+
# node-version: 16
4848
fail-fast: false
4949
environment:
5050
name: CICD
@@ -115,6 +115,11 @@ jobs:
115115
fi
116116
shell: bash
117117

118+
- uses: actions/setup-python@v5
119+
if: runner.os == 'macOS'
120+
with:
121+
python-version: '3.8'
122+
118123
- name: Setup Node.js ${{ matrix.node-version }} 📮
119124
uses: actions/setup-node@v3
120125
with:
@@ -132,7 +137,7 @@ jobs:
132137
if [[ ${{ matrix.os }} = "ubuntu-latest" ]] ; \
133138
then echo "system=ubuntu" >> $GITHUB_OUTPUT ; \
134139
echo "package=${{ steps.slug.outputs.display-name }}-linux-x64" >> $GITHUB_OUTPUT ; \
135-
elif [[ ${{ matrix.os }} = "macos-latest" ]] ; \
140+
elif [[ ${{ matrix.os }} = "macos-latest-large" ]] ; \
136141
then echo "system=macos" >> $GITHUB_OUTPUT ; \
137142
echo "package=${{ steps.slug.outputs.display-name }}-darwin-x64" >> $GITHUB_OUTPUT ; \
138143
elif [[ ${{ matrix.os }} = "windows-latest" ]] ; \
@@ -310,12 +315,12 @@ jobs:
310315
Set-DisplayResolution -Width 1920 -Height 1080 -Force
311316
shell: powershell
312317

313-
- name: screen resolution(For Mac)
314-
if: runner.os == 'macOS'
315-
run: |
316-
system_profiler SPDisplaysDataType | grep Resolution
317-
"/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
318-
system_profiler SPDisplaysDataType | grep Resolution
318+
# - name: screen resolution(For Mac)
319+
# if: runner.os == 'macOS'
320+
# run: |
321+
# system_profiler SPDisplaysDataType | grep Resolution
322+
# "/Library/Application Support/VMware Tools/vmware-resolutionSet" 2560 1440
323+
# system_profiler SPDisplaysDataType | grep Resolution
319324

320325
- name: main E2E Test for Electron 🧪
321326
if: "!contains(github.event.head_commit.message, 'skip e2e')"
@@ -486,7 +491,14 @@ jobs:
486491
xcrun notarytool submit "$SIGNED_DMG" -v --apple-id "$APPLE_ID" --password "$APPLE_ASP" --team-id "$APPLE_TEAM_ID" -f json --wait
487492
xcrun stapler staple "$SIGNED_DMG"
488493
echo "Finish notarizing dmg"
489-
494+
495+
- name: check
496+
if: runner.os == 'macOS'
497+
run: |
498+
ls
499+
echo "------------------------"
500+
ls ./dist/electron
501+
490502
- name: Package for ${{ steps.vars.outputs.system }}-${{ steps.unify.outputs.tag-name }} Release 🗜️
491503
if: contains(steps.vars.outputs.event-name, 'schedule') || contains(env.MODIFIED_FILE_LIST, 'release.json')
492504
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 }}"
@@ -499,7 +511,7 @@ jobs:
499511
- name: Release ${{ steps.slug.outputs.file-name-lower }}-${{ steps.unify.outputs.package-name }}-${{ steps.vars.outputs.system }} to GitHub 📰
500512
if: |
501513
(contains(steps.vars.outputs.event-name, 'schedule') || contains(env.MODIFIED_FILE_LIST, 'release.json')) &&
502-
(matrix.os != 'macos-latest' || contains(steps.check.outputs.isBuildUniversal, '0'))
514+
(matrix.os != 'macos-latest-large' || contains(steps.check.outputs.isBuildUniversal, '0'))
503515
uses: softprops/action-gh-release@v1
504516
with:
505517
prerelease: true
@@ -725,7 +737,7 @@ jobs:
725737
if [[ ${{ matrix.os }} = "ubuntu-latest" ]] ; \
726738
then echo "system=ubuntu" >> $GITHUB_OUTPUT ; \
727739
echo "package=${{ steps.slug.outputs.display-name }}-linux-x64" >> $GITHUB_OUTPUT ; \
728-
elif [[ ${{ matrix.os }} = "macos-latest" ]] ; \
740+
elif [[ ${{ matrix.os }} = "macos-latest-large" ]] ; \
729741
then echo "system=macos" >> $GITHUB_OUTPUT ; \
730742
echo "package=${{ steps.slug.outputs.display-name }}-darwin-x64" >> $GITHUB_OUTPUT ; \
731743
elif [[ ${{ matrix.os }} = "windows-latest" ]] ; \
@@ -794,9 +806,11 @@ jobs:
794806
sudo snap install multipass --classic
795807
796808
- name: Install Snapcraft
797-
uses: samuelmeuli/action-snapcraft@v1
809+
uses: samuelmeuli/action-snapcraft@v2
798810
with:
799811
use_lxd: true
812+
# env:
813+
# INPUT_CHANNEL: 7.x/stable
800814

801815
- name: Pack snap 📦
802816
run: yarn make:snap:ci

build-scripts/linux/snapcraft/snapcraft.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ summary: {{description}}
55
description: {{description}}
66
grade: stable
77
confinement: strict
8-
base: core18
8+
base: core22
99
# This tells snapcraft to cross-compile for target arch
1010
architectures:
1111
- build-on: {{arch}}

release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"targetTagName": "main",
3-
"newTagName": "0.3.2"
3+
"newTagName": "0.3.3"
44
}

0 commit comments

Comments
 (0)