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.

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

Fix macOS frontend CI disconnecting issue #2968

Merged
merged 30 commits into from
Oct 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8fa2d09
attempt
Yicong-Huang Oct 25, 2024
a4d5121
update karma and jasmine
Yicong-Huang Oct 25, 2024
7a9664f
reduce timeout
Yicong-Huang Oct 25, 2024
47be51c
fix testcases
Yicong-Huang Oct 26, 2024
7b9f8f4
fix tests
Yicong-Huang Oct 26, 2024
571a6c0
fix test framework
Yicong-Huang Oct 26, 2024
cd7fad6
change to log info
Yicong-Huang Oct 26, 2024
84fbe7f
fix format
Yicong-Huang Oct 26, 2024
c6ca0fd
change timeout
Yicong-Huang Oct 26, 2024
a27eceb
change timeout
Yicong-Huang Oct 26, 2024
4948ac4
change ci
Yicong-Huang Oct 26, 2024
1e0cc4b
change test setting
Yicong-Huang Oct 26, 2024
4ee72e7
use new headless
Yicong-Huang Oct 26, 2024
e6ff791
1 browser
Yicong-Huang Oct 26, 2024
22b34c4
change timeout
Yicong-Huang Oct 26, 2024
9765cab
change timeout
Yicong-Huang Oct 26, 2024
e6d25e1
try no nx
Yicong-Huang Oct 26, 2024
fdfdffb
use node 20
Yicong-Huang Oct 26, 2024
486bb79
update other settings
Yicong-Huang Oct 26, 2024
eaeae86
update other settings
Yicong-Huang Oct 26, 2024
e8f6251
prepare yarn 4
Yicong-Huang Oct 26, 2024
0fae3d4
change back
Yicong-Huang Oct 26, 2024
5b2a34f
use nx
Yicong-Huang Oct 26, 2024
98ffd50
change cache key
Yicong-Huang Oct 26, 2024
d797633
update
Yicong-Huang Oct 26, 2024
9686002
update
Yicong-Huang Oct 26, 2024
e792fdd
revert back ram config
Yicong-Huang Oct 26, 2024
c832bcf
remove unused
Yicong-Huang Oct 26, 2024
6f395c4
remove waitwebpack
Yicong-Huang Oct 26, 2024
132ec39
Merge branch 'master' into yicong-fix-frontend-ci-timeout
aglinxinyuan Oct 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update karma and jasmine
Yicong-Huang committed Oct 25, 2024
commit a4d51218e0663f59e52d88031024e71df914a683
13 changes: 6 additions & 7 deletions core/gui/package.json
Original file line number Diff line number Diff line change
@@ -133,13 +133,12 @@
"eslint-plugin-rxjs-angular": "2.0.1",
"fs-extra": "10.0.1",
"git-describe": "4.1.0",
"jasmine-core": "3.8.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "6.4.3",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.7.0",
"jasmine-core": "5.4.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
"nodecat": "2.0.0",
"nx": "20.0.3",
"nz-tslint-rules": "0.901.2",
Original file line number Diff line number Diff line change
@@ -33,4 +33,8 @@ describe("UserProjectListItemComponent", () => {
component.editable = true;
fixture.detectChanges();
});

it("should create", () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -26,4 +26,8 @@ describe("UserQuotaComponent", () => {
component = fixture.componentInstance;
userQuotaService = TestBed.inject(UserQuotaService) as jasmine.SpyObj<UserQuotaService>;
});

it("should create", () => {
expect(component).toBeTruthy();
});
});
Original file line number Diff line number Diff line change
@@ -259,24 +259,4 @@ describe("WorkflowActionService", () => {
// expect(sentimentOpPos).toEqual(mockPoint);
// expect(resultOpPos).toEqual(mockPoint);
});

describe("when linkBreakpoint is enabled", () => {
beforeAll(() => {
environment.linkBreakpointEnabled = true;
});

afterAll(() => {
environment.linkBreakpointEnabled = false;
});
});

describe("when executionStatus is enabled", () => {
beforeAll(() => {
environment.executionStatusEnabled = true;
});

afterAll(() => {
environment.executionStatusEnabled = false;
});
});
});

This file was deleted.

145 changes: 41 additions & 104 deletions core/gui/yarn.lock
Original file line number Diff line number Diff line change
@@ -11110,16 +11110,15 @@ __metadata:
fuse.js: "npm:6.5.3"
git-describe: "npm:4.1.0"
html2canvas: "npm:1.4.1"
jasmine-core: "npm:3.8.0"
jasmine-spec-reporter: "npm:5.0.2"
jasmine-core: "npm:5.4.0"
jasmine-spec-reporter: "npm:7.0.0"
jointjs: "npm:3.5.4"
js-abbreviation-number: "npm:1.4.0"
jszip: "npm:3.10.1"
karma: "npm:6.4.3"
karma-chrome-launcher: "npm:3.1.0"
karma-coverage: "npm:2.2.1"
karma-jasmine: "npm:4.0.1"
karma-jasmine-html-reporter: "npm:1.7.0"
karma: "npm:6.4.4"
karma-chrome-launcher: "npm:3.2.0"
karma-jasmine: "npm:5.1.0"
karma-jasmine-html-reporter: "npm:2.1.0"
lodash-es: "npm:4.17.21"
marked: "npm:4.3.0"
monaco-breakpoints: "npm:0.2.0"
@@ -11354,13 +11353,6 @@ __metadata:
languageName: node
linkType: hard

"html-escaper@npm:^2.0.0":
version: 2.0.2
resolution: "html-escaper@npm:2.0.2"
checksum: 10c0/208e8a12de1a6569edbb14544f4567e6ce8ecc30b9394fcaa4e7bb1e60c12a7c9a1ed27e31290817157e8626f3a4f29e76c8747030822eb84a6abb15c255f0a0
languageName: node
linkType: hard

"html2canvas@npm:1.4.1":
version: 1.4.1
resolution: "html2canvas@npm:1.4.1"
@@ -12220,14 +12212,14 @@ __metadata:
languageName: node
linkType: hard

"istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
"istanbul-lib-coverage@npm:^3.2.0":
version: 3.2.2
resolution: "istanbul-lib-coverage@npm:3.2.2"
checksum: 10c0/6c7ff2106769e5f592ded1fb418f9f73b4411fd5a084387a5410538332b6567cd1763ff6b6cadca9b9eb2c443cce2f7ea7d7f1b8d315f9ce58539793b1e0922b
languageName: node
linkType: hard

"istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
"istanbul-lib-instrument@npm:^5.0.4":
version: 5.2.1
resolution: "istanbul-lib-instrument@npm:5.2.1"
dependencies:
@@ -12240,38 +12232,6 @@ __metadata:
languageName: node
linkType: hard

"istanbul-lib-report@npm:^3.0.0":
version: 3.0.1
resolution: "istanbul-lib-report@npm:3.0.1"
dependencies:
istanbul-lib-coverage: "npm:^3.0.0"
make-dir: "npm:^4.0.0"
supports-color: "npm:^7.1.0"
checksum: 10c0/84323afb14392de8b6a5714bd7e9af845cfbd56cfe71ed276cda2f5f1201aea673c7111901227ee33e68e4364e288d73861eb2ed48f6679d1e69a43b6d9b3ba7
languageName: node
linkType: hard

"istanbul-lib-source-maps@npm:^4.0.1":
version: 4.0.1
resolution: "istanbul-lib-source-maps@npm:4.0.1"
dependencies:
debug: "npm:^4.1.1"
istanbul-lib-coverage: "npm:^3.0.0"
source-map: "npm:^0.6.1"
checksum: 10c0/19e4cc405016f2c906dff271a76715b3e881fa9faeb3f09a86cb99b8512b3a5ed19cadfe0b54c17ca0e54c1142c9c6de9330d65506e35873994e06634eebeb66
languageName: node
linkType: hard

"istanbul-reports@npm:^3.0.5":
version: 3.1.7
resolution: "istanbul-reports@npm:3.1.7"
dependencies:
html-escaper: "npm:^2.0.0"
istanbul-lib-report: "npm:^3.0.0"
checksum: 10c0/a379fadf9cf8dc5dfe25568115721d4a7eb82fbd50b005a6672aff9c6989b20cc9312d7865814e0859cd8df58cbf664482e1d3604be0afde1f7fc3ccc1394a51
languageName: node
linkType: hard

"jackspeak@npm:^3.1.2":
version: 3.4.3
resolution: "jackspeak@npm:3.4.3"
@@ -12299,26 +12259,26 @@ __metadata:
languageName: node
linkType: hard

"jasmine-core@npm:3.8.0":
version: 3.8.0
resolution: "jasmine-core@npm:3.8.0"
checksum: 10c0/080e820861dfbf6bc498b0abbb34ce16f8526099d77e9773ef6256ff07b4bda234e5e0b242b8c8eb01875bf0579cebce62687682b203fb9ec2dc4412f890bafc
"jasmine-core@npm:5.4.0":
version: 5.4.0
resolution: "jasmine-core@npm:5.4.0"
checksum: 10c0/d936de0df50a69bb269c734d5efc73d124c3051037d55609c30fcc146736ae281b1c2d658e7da583eee96a4eb2c240a3b672b70375e51d6c28c5626639eda292
languageName: node
linkType: hard

"jasmine-core@npm:^3.6.0":
version: 3.99.1
resolution: "jasmine-core@npm:3.99.1"
checksum: 10c0/f89721874e2af19a098e214b8f3f201a644d625339c010733b6b0dba4ff9149f16997712a639c2bb427e7533526f82e0477b7927e175d3a2b2f9ff92928a5329
"jasmine-core@npm:^4.1.0":
version: 4.6.1
resolution: "jasmine-core@npm:4.6.1"
checksum: 10c0/3d038b7f6f6f0d3cb56cdb4d2f0323a9d84f3a64a03746f9329a2d5a5166ec5e0ad3232d72ceb4f357cf2f120fdb86310715eaeb174f325833515fd0792a6860
languageName: node
linkType: hard

"jasmine-spec-reporter@npm:5.0.2":
version: 5.0.2
resolution: "jasmine-spec-reporter@npm:5.0.2"
"jasmine-spec-reporter@npm:7.0.0":
version: 7.0.0
resolution: "jasmine-spec-reporter@npm:7.0.0"
dependencies:
colors: "npm:1.4.0"
checksum: 10c0/18b5ce95c4de29b0bd3fe095021e39ffbbfd36e3feb29ba8d5d4d7653fc6474f9340b22acf74d5dac876890df15cd5420eae6b44472da0f01be4733b78881227
checksum: 10c0/0b69660100264c62ad19d8010056a94de6db853b7f468b6e94ef106776dce6eabf695260a790c79a6d94a46396d4b1cb595de449de477fa11478a833205cd6c3
languageName: node
linkType: hard

@@ -12643,48 +12603,34 @@ __metadata:
languageName: node
linkType: hard

"karma-chrome-launcher@npm:3.1.0":
version: 3.1.0
resolution: "karma-chrome-launcher@npm:3.1.0"
"karma-chrome-launcher@npm:3.2.0":
version: 3.2.0
resolution: "karma-chrome-launcher@npm:3.2.0"
dependencies:
which: "npm:^1.2.1"
checksum: 10c0/8dd7c545cc1ca397769acd99f45395cce8efb57a5b8ff0f65517f1afa3926c6036cff95722904855e17bc9a156aaa766f6e7bddcd2efb40c7492b525ce37ec45
languageName: node
linkType: hard

"karma-coverage@npm:2.2.1":
version: 2.2.1
resolution: "karma-coverage@npm:2.2.1"
dependencies:
istanbul-lib-coverage: "npm:^3.2.0"
istanbul-lib-instrument: "npm:^5.1.0"
istanbul-lib-report: "npm:^3.0.0"
istanbul-lib-source-maps: "npm:^4.0.1"
istanbul-reports: "npm:^3.0.5"
minimatch: "npm:^3.0.4"
checksum: 10c0/6496bb56b19b60e3f24a64e4da712a640a4f047fa271a40e321fca3e399e808246a38d434a1b77db4cc54d8f71164ebcb6cf310ae75c99ef957b7010b5d90f49
checksum: 10c0/0cec1ae7d922110dc29cee36389d597157c82f019c8917259f9fa93d1f5ee8e19141c2eb74bfe30797cdb3adbc51a6b65fd18a9ebc1527c725c4acf62cd46d04
languageName: node
linkType: hard

"karma-jasmine-html-reporter@npm:1.7.0":
version: 1.7.0
resolution: "karma-jasmine-html-reporter@npm:1.7.0"
"karma-jasmine-html-reporter@npm:2.1.0":
version: 2.1.0
resolution: "karma-jasmine-html-reporter@npm:2.1.0"
peerDependencies:
jasmine-core: ">=3.8"
karma: ">=0.9"
karma-jasmine: ">=1.1"
checksum: 10c0/d37bbc8fb435ecf1a3bd50e63cc0782e9d8a2736c30a814c6928fae51562caf97e3710a2005a2dfd0aeaefa67cf876c4f593eb16faa3f4adecb38db2d6d079bf
jasmine-core: ^4.0.0 || ^5.0.0
karma: ^6.0.0
karma-jasmine: ^5.0.0
checksum: 10c0/c20b0b52eada370d66fb06eda1a767f2043fecc6c4647691c889f4f62aa0f8948811dc64f033ebab02085a2e27e79099034ebe1699facf4e24e6bbc5ad0c203f
languageName: node
linkType: hard

"karma-jasmine@npm:4.0.1":
version: 4.0.1
resolution: "karma-jasmine@npm:4.0.1"
"karma-jasmine@npm:5.1.0":
version: 5.1.0
resolution: "karma-jasmine@npm:5.1.0"
dependencies:
jasmine-core: "npm:^3.6.0"
jasmine-core: "npm:^4.1.0"
peerDependencies:
karma: "*"
checksum: 10c0/28198b544353cfddbdcf7fdb1c0ce1aedf6abd139abba2082ee9f24535be485336dc210b849cfee4542bcb5c4a8c9c5f6985b7282f0199b3a039b846ecbac2ee
karma: ^6.0.0
checksum: 10c0/827843d2b4af5396c35de6911d15304955bd7376f96527f46285beb0178510aa401ff123a010a9ee3f13aeeeb56f64a9a3e22d7d61fb58ee76a2845b153a9d20
languageName: node
linkType: hard

@@ -12697,9 +12643,9 @@ __metadata:
languageName: node
linkType: hard

"karma@npm:6.4.3":
version: 6.4.3
resolution: "karma@npm:6.4.3"
"karma@npm:6.4.4":
version: 6.4.4
resolution: "karma@npm:6.4.4"
dependencies:
"@colors/colors": "npm:1.5.0"
body-parser: "npm:^1.19.0"
@@ -12727,7 +12673,7 @@ __metadata:
yargs: "npm:^16.1.1"
bin:
karma: bin/karma
checksum: 10c0/dc9710600c69265fce24a91312a136396acef969b72aac05e342724a4223a799cd3676a20f73a4beda797908b7f534fa95c8228bd79fd5c54682020c626e4fdd
checksum: 10c0/1658c4b7396c0edf6f048289182e075b561902e02992e1a3eb72f56f67090ff0c7ad7c91ab099e88a790c60f9500c5a6f974d75f1769e3ea2dfccda52876ec0b
languageName: node
linkType: hard

@@ -13336,15 +13282,6 @@ __metadata:
languageName: node
linkType: hard

"make-dir@npm:^4.0.0":
version: 4.0.0
resolution: "make-dir@npm:4.0.0"
dependencies:
semver: "npm:^7.5.3"
checksum: 10c0/69b98a6c0b8e5c4fe9acb61608a9fbcfca1756d910f51e5dbe7a9e5cfb74fca9b8a0c8a0ffdf1294a740826c1ab4871d5bf3f62f72a3049e5eac6541ddffed68
languageName: node
linkType: hard

"make-error@npm:^1.1.1":
version: 1.3.6
resolution: "make-error@npm:1.3.6"