From de31c07de27f9b800062cbaec574aeebd7ef3ef2 Mon Sep 17 00:00:00 2001 From: qiju_wangjiacheng Date: Mon, 16 Jul 2018 15:09:06 +0800 Subject: [PATCH 1/5] Add initial Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..2b6476817e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' + } + } + stages { + stage('Build') { + steps { + sh 'npm install' + } + } + } +} \ No newline at end of file From 4e5de56da4bc8c4c6d55bd7201836095456f2c2a Mon Sep 17 00:00:00 2001 From: qiju_wangjiacheng Date: Mon, 16 Jul 2018 17:11:36 +0800 Subject: [PATCH 2/5] a --- Jenkinsfile | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b6476817e..c0272abc70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,11 +5,20 @@ pipeline { args '-p 3000:3000' } } + environment { + CI = 'true' + } stages { stage('Build') { steps { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } } + } \ No newline at end of file diff --git a/package.json b/package.json index 53720bdbbb..9429268ca0 100644 --- a/package.json +++ b/package.json @@ -13,4 +13,4 @@ "test": "react-scripts test --env=jsdom", "eject": "react-scripts eject" } -} \ No newline at end of file +} From b209dcf47c07e3a89b5dd9fbd68ccb4d43a4cfe1 Mon Sep 17 00:00:00 2001 From: qiju_wangjiacheng Date: Mon, 16 Jul 2018 17:19:01 +0800 Subject: [PATCH 3/5] 1 --- public/index.html | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/public/index.html b/public/index.html index 7bee027101..341d5a2ed9 100644 --- a/public/index.html +++ b/public/index.html @@ -1,16 +1,17 @@ - - - - - - - - - React App - - - -
- - - + + + \ No newline at end of file From 73ac2f8898f71279165e1b0467aa06e6f6bc71b6 Mon Sep 17 00:00:00 2001 From: qiju_wangjiacheng Date: Mon, 16 Jul 2018 17:21:04 +0800 Subject: [PATCH 4/5] 2 --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 341d5a2ed9..84335d5b71 100644 --- a/public/index.html +++ b/public/index.html @@ -25,7 +25,7 @@