diff --git a/.gitignore b/.gitignore index b7942817..1e0673e6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ web/.github/ web/report* log/ .env -web +/web/ diff --git a/Jenkinsfile b/Jenkinsfile index f285daed..1dc15bfb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,8 @@ pipeline { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-linux' diff --git a/console.service b/console.service deleted file mode 100644 index dfdb1d1f..00000000 --- a/console.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=infini-console -After=network.target - -[Service] -Type=forking -WorkingDirectory=/opt/console -ExecStart=/opt/console/console -daemon -pidfile /var/run/infini-console.pid -config /opt/console/console.yml -ExecStop=/bin/kill `cat /var/run/infini-console.pid` -PrivateTmp=true -User=root -Group=root -LimitNOFILE=16384:163840 - -[Install] -WantedBy=multi-user.target \ No newline at end of file