[SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 10 commits: SUCS Site auto deploy on push

[Imran Hussain]

Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
34804f8d by Imran Hussain at 2019-07-01T16:03:22Z
SUCS Site auto deploy on push

- - - - -
9670a51f by Imran Hussain at 2019-07-01T16:07:16Z
Merge branch 'master' into 'beta'

SUCS Site auto deploy on push

See merge request sucssite/sucs-site!107
- - - - -
94fccbb1 by Imran Hussain at 2019-07-01T16:11:32Z
non-interactive! need a -y in gitlab-ci!
- - - - -
5e80bacf by Imran Hussain at 2019-07-01T16:14:30Z
Merge branch 'master' into 'beta'

non-interactive! need a -y in gitlab-ci!

See merge request sucssite/sucs-site!108
- - - - -
8c489c75 by Imran Hussain at 2019-07-01T16:39:03Z
throw in a --insecure as the LE cert not trusted by this docker container
- - - - -
2852e83b by Imran Hussain at 2019-07-01T16:44:00Z
Merge branch 'master' into 'beta'

throw in a --insecure as the LE cert not trusted by this docker container

See merge request sucssite/sucs-site!109
- - - - -
503dc539 by Imran Hussain at 2019-07-02T08:34:45Z
Revert "throw in a --insecure as the LE cert not trusted by this docker container"

This reverts commit 8c489c75f2d45e8cff4327b6ae449a9221bfbcca
- - - - -
56268f16 by Imran Hussain at 2019-07-02T08:41:18Z
make the pull script do errors better

- - - - -
6cf55875 by Imran Hussain at 2019-07-02T08:45:16Z
Merge branch 'master' into 'beta'

Merge changes into beta

See merge request sucssite/sucs-site!110
- - - - -
37529fc8 by Imran Hussain at 2019-07-02T08:54:22Z
Merge branch 'beta' into 'sucs-site'

ability for site to auto deploy

See merge request sucssite/sucs-site!111
- - - - -


2 changed files:

- .gitlab-ci.yml
- + htdocs/pull.php


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -33,18 +33,22 @@ js-syntax-check:
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 
-fake-deploy-beta:
+deploy-beta:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - curl https://beta.sucs.org/pull.php
   only:
    - beta
   environment: beta
 
-fake-deploy-live:
+deploy-live:
   stage: deploy
   script:
-   - echo "Hello World!"
+   - apt update
+   - apt install -y curl
+   - curl https://sucs.org/pull.php
   only:
    - sucs-site
   environment: live
\ No newline at end of file


=====================================
htdocs/pull.php
=====================================
@@ -0,0 +1,14 @@
+<?php
+
+exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
+
+if ($retVal == 0) {
+	print(ok);
+	exit(0)
+}
+
+print("not ok\n");
+var_dump($retArr);
+var_dump($retVal);
+
+?>
\ No newline at end of file



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/bb7e6d0acb9581af00d8af7f16952204b0d0cedf...37529fc81673abdf7a619b658b5ddde645880aae

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/bb7e6d0acb9581af00d8af7f16952204b0d0cedf...37529fc81673abdf7a619b658b5ddde645880aae
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190702/9ab35c3e/attachment-0001.html>