Skip to content

Commit

Permalink
🚚 Fix potential source of failure in automatic merge script (#5316)
Browse files Browse the repository at this point in the history
rix0rrr authored Mar 26, 2024

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent e3f7c23 commit 0bf8735
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/resolve-weblate-conflict.yml
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ jobs:
- uses: actions/checkout@v4
name: Checkout branch
with:
fetch-depth: 1
fetch-depth: 0
# token: ${{ steps.secret.outputs.secret }}
# Let's see if the GitHub Token suffices
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion tools/merge-weblate-resolving-conflicts.sh
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ set -eu
set -x

# Checkout Weblate main repo
git remote add -f weblate-main https://hosted.weblate.org/git/hedy/adventures/ || true
git remote add weblate-main https://hosted.weblate.org/git/hedy/adventures/ || true
git fetch weblate-main
git checkout -B weblate-hedy-adventures-conflicts weblate-main/main

0 comments on commit 0bf8735

Please sign in to comment.