From eef292767ac977cfa4928a4e0fac5600b49fa9ed Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sat, 23 Jan 2021 10:33:01 +0100
Subject: [PATCH] gitlab-ci-cd/drupal#4 Make variable SSH_PRIVATE_KEY optional
---
test-and-deploy.yml | 46 +++++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 5c4b8bf..29e800c 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -94,26 +94,32 @@ stages:
cache:
<<: *cache_default
policy: pull-push
- script:
- - eval $(ssh-agent -s)
- - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- - mkdir -p ~/.ssh
- - chmod 700 ~/.ssh
- - ssh-keyscan gitlab.lakedrops.com >> ~/.ssh/known_hosts
- - chmod 644 ~/.ssh/known_hosts
- - ssh git@gitlab.lakedrops.com
- - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
- - if [[ -n $GITLAB_ACCESS_TOKEN ]]; then composer config -g gitlab-token.gitlab.lakedrops.com $GITLAB_ACCESS_TOKEN; fi
- - composer install --no-interaction --no-progress
- - composer lakedrops:scaffold --no-interaction
- - composer lakedrops:docker4drupal --no-interaction
- - docker-compose up -d
- - composer lakedrops:behat --no-interaction
- - mkdir -p files/default/files/css
- - mkdir -p files/default/files/js
- - mkdir -p files/default/files/languages
- - mkdir -p files/default/files/translations
- - chmod -R ugo+w files/default/files/
+ script: |
+ if [[ -n $SSH_PRIVATE_KEY ]]; then
+ eval $(ssh-agent -s)
+ echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+ mkdir -p ~/.ssh
+ chmod 700 ~/.ssh
+ ssh-keyscan gitlab.lakedrops.com >> ~/.ssh/known_hosts
+ chmod 644 ~/.ssh/known_hosts
+ ssh git@gitlab.lakedrops.com
+ fi
+ if [[ -n $DOWNGRADE_COMPOSER ]]; then
+ composer self-update --$DOWNGRADE_COMPOSER;
+ fi
+ if [[ -n $GITLAB_ACCESS_TOKEN ]]; then
+ composer config -g gitlab-token.gitlab.lakedrops.com $GITLAB_ACCESS_TOKEN;
+ fi
+ composer install --no-interaction --no-progress
+ composer lakedrops:scaffold --no-interaction
+ composer lakedrops:docker4drupal --no-interaction
+ docker-compose up -d
+ composer lakedrops:behat --no-interaction
+ mkdir -p files/default/files/css
+ mkdir -p files/default/files/js
+ mkdir -p files/default/files/languages
+ mkdir -p files/default/files/translations
+ chmod -R ugo+w files/default/files/
artifacts:
name: build
when: always
--
GitLab