Browse Source

Trying jekyll deploy

Nathan Schneider 4 years ago
parent
commit
2b079924c7
2 changed files with 14 additions and 15 deletions
  1. 11 13
      .gitlab-ci.yml
  2. 3 2
      _config.yml

+ 11 - 13
.gitlab-ci.yml

@@ -5,25 +5,23 @@ stages:
 
 before_script:
 #  - apt-get update -qq && apt-get install -y -qq libcurl4-openssl-dev lftp
-  - apt-get update -qq && apt-get install -y -qq rsync sshpass
   - bundle install
   - gem install jekyll
 
 deploy_script:
-  stage: deploy
-  only:
-    - master
-  environment:
-    name: website
-    url: https://cmci.colorado.edu/cmci
-  script:
-    - echo "Building.."
-    - bundle exec jekyll build --config _config.yml
-    - echo "Deploying.."
-    - cd _site && rsync --verbose -crPze ssh --delete --rsh="sshpass -p $CU_PASSWORD ssh -o StrictHostKeyChecking=no " ./* $CU_USR@$CU_HOSTNAME:/data/web/htdocs/cmci/medlab
-    - echo "Done!"
+  - jekyll deploy
+
+#  stage: deploy
+#  only:
+#    - master
+#  environment:
+#    name: website
+#    url: https://cmci.colorado.edu/cmci
+#  script:
+#    - echo "Building.."
 #    - chmod +x ./_scripts/build.sh
 #    - ./_scripts/build.sh
+#    - echo "Deploying.."
 #    - chmod +x ./_scripts/deploy_website.sh
 #    - ./_scripts/deploy_website.sh
 

+ 3 - 2
_config.yml

@@ -36,8 +36,9 @@ collections:
 deploy:
 #  - cd .. && jekyll build
 #  - cd .. && read -p 'Commit message: ' message && git commit -a -m $message
-  - rsync -crPze ssh --delete ./* nasc0399@cmci.colorado.edu:/data/web/htdocs/cmci/medlab
-        
+  - rsync -crPze --delete --rsh="sshpass -p $CU_PASSWORD ssh -o StrictHostKeyChecking=no " ./* $CU_USR@$CU_HOST:/data/web/htdocs/cmci/medlab
+#  - rsync -crPze ssh --delete ./* nasc0399@cmci.colorado.edu:/data/web/htdocs/cmci/medlab
+
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
 # to override the default setting.