Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: flow stuck when flow projects > 1 and diff #821

Merged
merged 14 commits into from
May 7, 2024
Merged

fix: flow stuck when flow projects > 1 and diff #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5fcbaa3
fix: flow stuck when flow projects > 1 and diff
zxypro1 Apr 28, 2024
d8224b3
update workflow
zxypro1 Apr 28, 2024
0fb23cc
update workflow
zxypro1 Apr 28, 2024
850b4ae
update workflow
zxypro1 Apr 28, 2024
0e31f04
fix workflow
zxypro1 Apr 28, 2024
d91ee34
update workflow
zxypro1 Apr 28, 2024
f055262
fix workflow
zxypro1 Apr 28, 2024
f442a36
fix workflow
zxypro1 Apr 28, 2024
691b850
fix workflow test
zxypro1 Apr 28, 2024
112e685
fix workflow
zxypro1 Apr 28, 2024
8397961
fix workflow
zxypro1 Apr 28, 2024
1c143d6
fix: unable to use default env if `env` is not set
zxypro1 May 7, 2024
0ecf972
test ci
zxypro1 May 7, 2024
335e7b6
test ci
zxypro1 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest, macos-latest]
node-version: [14.x, 16.x, 20.x]
os: [ubuntu-latest, macos-12]
node-version: [14, 16, 20]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/multi-os-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
include:
- os: ubuntu-latest
- os: macos-latest
# - os: windows-latest
# - os: windows-2019
- os: ubuntu-latest
container: debian:latest
- os: ubuntu-latest
Expand All @@ -25,7 +25,7 @@ jobs:
container: ${{ matrix.container || '' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
container: ${{ matrix.container || '' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
container: ${{ matrix.container || '' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18
uses: actions/setup-node@v4
with:
Expand Down
92 changes: 72 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@
"devDependencies": {
"@serverless-devs/core": "^0.1.67-beta.1",
"@serverless-devs/credential": "^0.0.6-beta.1",
"@serverless-devs/engine": "^0.1.2-beta.9",
"@serverless-devs/engine": "^0.1.2-beta.11",
"@serverless-devs/load-application": "^0.0.13-beta.6",
"@serverless-devs/load-component": "^0.0.7-beta.4",
"@serverless-devs/logger": "^0.0.5-beta.2",
"@serverless-devs/parse-spec": "^0.0.26-beta.3",
"@serverless-devs/parse-spec": "^0.0.26-beta.4",
"@serverless-devs/registry": "^0.0.9",
"@serverless-devs/utils": "^0.0.14",
"@types/fs-extra": "^11.0.4",
Expand Down
4 changes: 3 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ const preRun = () => {
// 设置全局代理
setProxy();
// 检查更新
new UpdateNotifier().init().notify();
try {
new UpdateNotifier().init().notify();
} catch {}
// 加载.env文件
expand(dotenv.config({ path: path.join(process.cwd(), '.env') }));
};
Expand Down