diff options
| -rw-r--r-- | .build.yml | 2 | ||||
| -rwxr-xr-x | scripts/ci/provision.sh | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -10,7 +10,7 @@ sources: - https://git.sr.ht/~euandreh/vps-state secrets: - d587955c-03fb-42ba-9e01-68ca8ed89f99 - - 7159f943-811f-402d-bb6d-37cd764dc728 + - b715d3df-a0e2-4d5a-a6f3-ece5d0025cad tasks: - setup: | ./vps/scripts/ci/setup.sh diff --git a/scripts/ci/provision.sh b/scripts/ci/provision.sh index 2941d03..d0afb28 100755 --- a/scripts/ci/provision.sh +++ b/scripts/ci/provision.sh @@ -5,11 +5,12 @@ set -Eeuo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" cd ../../ +export VPS_COMMIT_SHA="$(git rev-parse HEAD)" echo "Shutting down running containers and backing up data..." ssh "$TLD" "cd /home/vps/ && docker-compose down" scp ./secrets/borg_remote.pub "$TLD":/root/.ssh/id_rsa.pub scp ./secrets/borg_remote "$TLD":/root/.ssh/id_rsa -VPS_COMMIT_SHA="$(git rev-parse HEAD)" envsubst < ./scripts/box/run-backup-template.sh | ssh "$TLD" 'cat > /home/vps/run-backup.sh && chmod +x /home/vps/run-backup.sh' +envsubst < ./scripts/box/run-backup-template.sh | ssh "$TLD" 'cat > /home/vps/run-backup.sh && chmod +x /home/vps/run-backup.sh' ssh "$TLD" /home/vps/run-backup.sh echo "Done." @@ -18,14 +19,14 @@ echo "Running 'terraform plan' and storing the planfile..." terraform --version terraform init mkdir -p "../vps-state/secrets/plan-files/" -PLAN_FILE_NAME="$(date -Iseconds)-$(git rev-parse HEAD).tfplan" +PLAN_FILE_NAME="$(date -Iseconds)-$VPS_COMMIT_SHA.tfplan" PLAN_FILE_PATH="../vps-state/secrets/plan-files/$PLAN_FILE_NAME" terraform plan -input=false -out="$PLAN_FILE_PATH" # Store on git repo pushd ../vps-state/ git add "secrets/plan-files/$PLAN_FILE_NAME" -git commit -m "CI: add .tfplan plan file for CI run $(git rev-parse HEAD)" +git commit -m "CI: add .tfplan plan file for CI run $VPS_COMMIT_SHA" git push origin master popd echo "Done." @@ -37,7 +38,7 @@ echo "Done." echo "Storing .tfstate file..." pushd ../vps-state/ git add secrets/terraform.tfstate secrets/terraform.tfstate.backup -git commit -m "CI: update Terraform .tfstate files for CI run $(git rev-parse HEAD)" +git commit -m "CI: update Terraform .tfstate files for CI run $VPS_COMMIT_SHA" git push origin master popd echo "Done." |