From b80e68877ff995aa46e07affbf7c8a79434966cc Mon Sep 17 00:00:00 2001
From: centdix <40307056+centdix@users.noreply.github.com>
Date: Sat, 19 Jul 2025 01:17:28 +0200
Subject: [PATCH] fix update sqlx action logic (#6234)

* fix pull

* update postgres
---
 .github/workflows/git-commands.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/git-commands.yaml b/.github/workflows/git-commands.yaml
index 9dcae33bb1..cafc4fed05 100644
--- a/.github/workflows/git-commands.yaml
+++ b/.github/workflows/git-commands.yaml
@@ -15,7 +15,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:16
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_USER: postgres
@@ -76,6 +76,10 @@ jobs:
           BRANCH_NAME=$(gh pr view $PR_NUMBER --json headRefName --jq .headRefName)
           echo "Checking out PR branch: $BRANCH_NAME"
           git checkout $BRANCH_NAME
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git config pull.rebase true
+          git pull origin $BRANCH_NAME
           mkdir frontend/build
           cd backend
           cargo install sqlx-cli --version 0.8.5
@@ -86,10 +90,6 @@ jobs:
 
       - name: Commit changes if any
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git config pull.rebase true
-          git pull origin ${{ env.BRANCH_NAME }}
           git add backend/.sqlx
           git commit -m "Update SQLx metadata"
           git push origin ${{ env.BRANCH_NAME }}