diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 132af32..dccb2b4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,30 +8,27 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Extract project_id id: pj run: echo "pid=$(jq -r .project_id <<< '${{ secrets.GCP_SA_KEY_JSON }}')" >> $GITHUB_OUTPUT - - uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCP_SA_KEY_JSON }} - - uses: hashicorp/setup-terraform@v3 - - name: Terraform Init working-directory: terraform - run: terraform init - + env: + TF_VAR_project_id: ${{ steps.pj.outputs.pid }} + run: terraform init -input=false - name: Terraform Import firewall if exists working-directory: terraform + env: + TF_VAR_project_id: ${{ steps.pj.outputs.pid }} run: | set +e - terraform import google_compute_firewall.gitea_allow projects/${{ steps.pj.outputs.pid }}/global/firewalls/allow-gitea-3000-ssh - set -e || true - + terraform import -input=false google_compute_firewall.gitea_allow projects/${{ steps.pj.outputs.pid }}/global/firewalls/allow-gitea-3000-ssh >/dev/null 2>&1 || true - name: Terraform Apply working-directory: terraform env: TF_VAR_project_id: ${{ steps.pj.outputs.pid }} - run: terraform apply -auto-approve \ No newline at end of file + run: terraform apply -auto-approve -input=false