Update update-pull-request.yml

Signed-off-by: Jhoan <jhoan2929@gmail.com>
kubernetes · Apr 26, 2024 · 5ffd3e1 · 5ffd3e1
1 parent 2c25784
commit 5ffd3e1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/update-pull-request.yml b/.github/workflows/update-pull-request.yml
@@ -18,13 +18,15 @@ jobs:
       - name: Agregar remoto del repo oficial
         run: git remote add kube-dash ${{ env.kube_dash_url }}
       - name: Obtener cambios del repo oficial
-        run: git fetch kube-dash "refs/heads/${{ github.event.pull_request.base.ref }}"
+        run: git fetch kube-dash master
       - name: Configurar identidad de usuario de Git
         run: |
           git config --global user.email "${{ github.event.pull_request.user.email }}"
           git config --global user.name "${{ github.event.pull_request.user.login }}"
-      - name: Actualizar rama local
-        run: git merge FETCH_HEAD --allow-unrelated-histories
+      - name: Actualizar rama local desde el repositorio oficial
+          run:|
+            git checkout master
+            git merge FETCH_HEAD --allow-unrelated-histories
       - name: Empujar cambios a la rama
         run: git push origin HEAD