Update train-deploy.yaml

.github/workflows/train-deploy.yaml

@@ -15,12 +15,28 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
       with:
-        fetch-depth: 0  # Ensures all branches are fetched
+        fetch-depth: 0  # Fetch all branches
 
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: 3.8
+    - name: Set up Git
+      run: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "dani-ange"
+
+    - name: Ensure master branch is up-to-date
+      run: |
+        git checkout master  # Ensure we're on master
+        git pull origin master  # Get latest changes
+
+    - name: Merge PR changes into master
+      run: |
+        # Ensure the PR branch is properly merged
+        if git branch -r | grep "origin/${{ github.head_ref }}"; then
+          git merge --no-ff origin/${{ github.head_ref }} -m "Merging PR changes from ${{ github.head_ref }}"
+          git push origin master  # Push merged changes
+        else
+          echo "Error: Branch ${{ github.head_ref }} does not exist in remote."
+          exit 1
+        fi
 
     - name: Install dependencies
       run: pip install -r requirements.txt
@@ -32,26 +48,11 @@ jobs:
       run: |
         huggingface-cli login --token "${{ secrets.HUGGINGFACE_API_TOKEN }}" --add-to-git-credential
 
-    - name: Merge PR changes into master
-      run: |
-        git config --global user.email "[email protected]"
-        git config --global user.name "dani-ange"
-
-        git checkout master  # Switch to master branch
-        git pull origin master  # Ensure latest changes
-
-        # Merge PR changes from the pull request branch
-        git merge --no-ff ${{ github.head_ref }} -m "Merging PR changes from ${{ github.head_ref }}"
-
-        git push origin master  # Push merged changes to master
-
     - name: Deploy to Hugging Face
       env:
         HF_TOKEN: ${{ secrets.HUGGINGFACE_API_TOKEN }}
       run: |
         huggingface-cli login --token $HF_TOKEN
-        git config --global user.email "[email protected]"
-        git config --global user.name "dani-ange"
 
         if git diff --quiet; then
             echo "No changes to commit."