added merge only ci test
This commit is contained in:
parent
8147d0db77
commit
ff1e72b3df
@ -1,6 +1,7 @@
|
||||
stages:
|
||||
- build
|
||||
- deploy
|
||||
-test
|
||||
|
||||
develop-build-job:
|
||||
stage: build
|
||||
@ -48,3 +49,10 @@ deploy-job:
|
||||
- ssh -p "$Live_Server_Access_Port" "$Live_Server_User"@"$Live_Server_IP" "rm -Rf /var/www/html/inkletblot-com_old && mv /var/www/html/inkletblot-com /var/www/html/inkletblot-com_old && mkdir /var/www/html/inkletblot-com_build && mkdir /var/www/html/inkletblot-com && tar zxf /var/www/html/inkletblot-com.tar.gz -C /var/www/html/inkletblot-com_build && mv /var/www/html/inkletblot-com_build/dist/inkletblot-com/* /var/www/html/inkletblot-com && rm -Rf /var/www/html/inkletblot-com_build && chmod -R 755 /var/www/html/inkletblot-com && exit"
|
||||
only:
|
||||
- master
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- echo "I don't care about standard merges into dev as a build has to happen for a merge into master, I don't think there is a way to specify that so I need this here."
|
||||
only:
|
||||
- merge_requests
|
||||
|
||||
Reference in New Issue
Block a user