Skip to content

Commit 4e73f7f

Browse files
hpyourdkmaster
authored andcommitted
CI: fixes buid error (#497)
* fixes buid error * fixes build error * fixes build error * fixes build error * fixes build error * fixes build error * fixes build error
1 parent 8ea0f20 commit 4e73f7f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build/scripts/integrate-with-seed.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
home=`pwd`
33

44
seedDir=`pwd`/../jigsaw-seed
5+
rm -fr $seedDir
56
mkdir -p $seedDir
67
git clone https://github.com/rdkmaster/jigsaw-seed.git $seedDir
78
cd $seedDir
@@ -15,11 +16,11 @@ cp -r $home/dist/releases/jigsaw node_modules/@rdkmaster/
1516
rm -fr ./e2e
1617
cp -r $home/e2e ./
1718

18-
rm -fr src/app src/assets src/styles.scss
19-
cp -r $home/src/app $home/src/styles.scss src/
19+
rm -fr src/app src/assets src/index.html src/typings.d.ts
20+
cp -r $home/src/app $home/src/index.html $home/src/jigsaw/typings.d.ts src/
2021

2122
rm -fr ./protractor.conf.js
22-
cp -r $home/protractor.conf.js ./
23+
cp -r $home/protractor-config-for-components.js ./protractor.conf.js
2324

2425
mkdir -p src/mock-data
2526
cp -r $home/src/mock-data src/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"ztree": "~3.5.24"
3838
},
3939
"devDependencies": {
40-
"@angular/cli": "^1.5.0",
40+
"@angular/cli": "1.6.8",
4141
"@angular/compiler-cli": "^5.0.0",
4242
"@angular/language-service": "~5.0.2",
4343
"@angular/tsc-wrapped": "~4.3.3",

0 commit comments

Comments
 (0)