opdavies/oliverdavies.uk-drupal-old
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

refactor: move more into the ci:deploy task

Browse source
This commit is contained in:
Oliver Davies 2021-12-09 22:24:11 +00:00
parent 24caeae329
commit 423e21f6c3
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View file

@ -204,20 +204,13 @@ jobs:
path: tools/deployment/.roles path: tools/deployment/.roles
key: dependencies-composer-${{ hashFiles('tools/deployment/requirements.yml') }} key: dependencies-composer-${{ hashFiles('tools/deployment/requirements.yml') }}
- name: Download Ansible roles
run: ansible-galaxy install -r tools/deployment/requirements.yml
- name: Export the Ansible Vault password - name: Export the Ansible Vault password
run: echo $ANSIBLE_VAULT_PASS > tools/deployment/.vault-pass.txt run: echo $ANSIBLE_VAULT_PASS > tools/deployment/.vault-pass.txt
env: env:
ANSIBLE_VAULT_PASS: ${{ secrets.ANSIBLE_VAULT_PASS }} ANSIBLE_VAULT_PASS: ${{ secrets.ANSIBLE_VAULT_PASS }}
- name: Deploy the code - name: Deploy the code
run: > run: ./run ci:deploy
ansible-playbook tools/deployment/deploy.yml
-i tools/deployment/hosts.yml
-e "ansistrano_deploy_branch=$GITHUB_SHA"
--vault-password-file=tools/deployment/.vault-pass.txt
- name: Remove the Ansible Vault password file - name: Remove the Ansible Vault password file
run: rm tools/deployment/.vault-pass.txt run: rm tools/deployment/.vault-pass.txt

4
run
View file

@ -17,8 +17,12 @@ function task:ci:build {
} }
function task:ci:deploy { function task:ci:deploy {
ansible-galaxy install -r tools/deployment/requirements.yml
ansible-playbook tools/deployment/deploy.yml \ ansible-playbook tools/deployment/deploy.yml \
-e "ansistrano_deploy_branch=${1:-production}" \
-i tools/deployment/hosts.yml \ -i tools/deployment/hosts.yml \
--vault-password-file="${2:-tools/deployment/.vault-pass.txt}" \
"${@}" "${@}"
} }