From 82cf591a2059314c5ee465f2714ac1f020028615 Mon Sep 17 00:00:00 2001 From: Viktor Barzin Date: Sun, 2 Mar 2025 20:26:36 +0000 Subject: [PATCH] rebase before pushing certificates --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1b069f71..e90ac898 100644 --- a/.drone.yml +++ b/.drone.yml @@ -98,7 +98,6 @@ steps: - "apk update && apk add git certbot expect curl gzip wget jq" # Install terraform cli # - "curl https://releases.hashicorp.com/terraform/1.10.3/terraform_1.10.3_linux_amd64.zip | gzip -d > /usr/local/bin/terraform && chmod 775 /usr/local/bin/terraform" - - "echo hehehehehehehe" - "wget -O terraform_1.10.3_linux_amd64.zip https://releases.hashicorp.com/terraform/1.10.3/terraform_1.10.3_linux_amd64.zip && unzip -o terraform_1.10.3_linux_amd64.zip && mv terraform /usr/local/bin/ && chmod 775 /usr/local/bin/terraform" - "/usr/local/bin/terraform init" - "./modules/kubernetes/setup_tls_secret/renew2.sh" @@ -111,4 +110,4 @@ steps: - "git add ." - "git remote set-url origin git@github.com:ViktorBarzin/infra.git" - "git commit -m 'Drone CI Update TLS Certificates Commit' || echo 'No changes'" - - "GIT_SSH_COMMAND='ssh -i ./secrets/deploy_key -o IdentitiesOnly=yes' git push origin master" + - "git pull --rebase origin master && GIT_SSH_COMMAND='ssh -i ./secrets/deploy_key -o IdentitiesOnly=yes' git push origin master"