From bf80e60d7f3b6dd7307885bc169f0a5d15a6e799 Mon Sep 17 00:00:00 2001 From: Damien Arnodo Date: Mon, 8 Dec 2025 15:56:31 +0000 Subject: [PATCH] fix(ci): use head_ref for PR checkout instead of ref_name - gitea.ref_name returns PR number for pull_request events - Use gitea.head_ref (source branch) for PRs - Use gitea.ref_name for push events - Remove unnecessary git checkout sha step - Clean up redundant Save Plan Output step Refs #3 --- .gitea/workflows/terraform.yml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/terraform.yml b/.gitea/workflows/terraform.yml index 98793ee..ac1b3a6 100644 --- a/.gitea/workflows/terraform.yml +++ b/.gitea/workflows/terraform.yml @@ -37,8 +37,13 @@ jobs: steps: - name: Checkout run: | - git clone --depth 1 --branch ${{ gitea.ref_name }} https://${GIT_TOKEN}@gitea.arnodo.fr/${{ gitea.repository }}.git . - git checkout ${{ gitea.sha }} + # For PRs, use head_ref (source branch), for push use ref_name + if [ "${{ gitea.event_name }}" = "pull_request" ]; then + BRANCH="${{ gitea.head_ref }}" + else + BRANCH="${{ gitea.ref_name }}" + fi + git clone --depth 1 --branch "${BRANCH}" https://${GIT_TOKEN}@gitea.arnodo.fr/${{ gitea.repository }}.git . - name: Terraform Format Check id: fmt @@ -92,8 +97,12 @@ jobs: steps: - name: Checkout run: | - git clone --depth 1 --branch ${{ gitea.ref_name }} https://${GIT_TOKEN}@gitea.arnodo.fr/${{ gitea.repository }}.git . - git checkout ${{ gitea.sha }} + if [ "${{ gitea.event_name }}" = "pull_request" ]; then + BRANCH="${{ gitea.head_ref }}" + else + BRANCH="${{ gitea.ref_name }}" + fi + git clone --depth 1 --branch "${BRANCH}" https://${GIT_TOKEN}@gitea.arnodo.fr/${{ gitea.repository }}.git . - name: Terraform Init run: terraform init -input=false @@ -113,14 +122,6 @@ jobs: exit 0 working-directory: ${{ env.TF_WORKING_DIR }} - - name: Save Plan Output - if: always() - run: | - mkdir -p /tmp/tfplan-artifact - cp tfplan /tmp/tfplan-artifact/ 2>/dev/null || true - cp plan_output.txt /tmp/tfplan-artifact/ 2>/dev/null || true - working-directory: ${{ env.TF_WORKING_DIR }} - - name: Plan Summary if: always() run: | @@ -137,8 +138,6 @@ jobs: - name: Comment PR with Plan if: gitea.event_name == 'pull_request' - env: - GIT_TOKEN: ${{ secrets.GIT_TOKEN }} run: | PLAN_OUTPUT=$(cat plan_output.txt | head -c 60000) COMMENT_BODY=$(cat <