update actions (#41)

* update actions * Update transifex_rebase.yml
beyond-all-reason · Oct 5, 2024 · f313936 · f313936
1 parent 58293a3
commit f313936
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/transifex_merge.yml b/.github/workflows/transifex_merge.yml
@@ -26,20 +26,12 @@ jobs:
 
       - name: Force merge translation directories (excluding English)
         run: |
-          echo "1"
-          git status
           git fetch --unshallow origin transifex-synchronization-source
-          echo "2"
-          git status
           for dir in language/*/; do
             if [ -d $dir ] && [ "$(basename $dir)" != "en" ]; then
               git checkout origin/transifex-synchronization-source -- $dir
               git add $dir
             fi
           done
-          echo "4"
-          git status
           git commit -m "[Transifex] Update translations on master"
-          echo "5"
-          git status
           git push origin master --force
diff --git a/.github/workflows/transifex_rebase.yml b/.github/workflows/transifex_rebase.yml
@@ -14,15 +14,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          ref: transifex-synchronization-source
 
       - name: Setup Git User
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
 
-      - name: Transifex Rebase
+      - name: Update English Source to Transifex
         run: |
-          git checkout transifex-synchronization-source
-          git reset origin/master --hard
-          git push origin transifex-synchronization-source --force-with-lease
+          git checkout origin/master -- language/en
+          git add language/en
+          git commit -m "[Transifex] Update English source files"
+          git push origin transifex-synchronization-source --force