Update references for branch `master` to refer to `main`

This commit is contained in:
Johannes Meyer 2022-01-10 12:10:45 +01:00
parent 6f04ce899e
commit 1ea749f493
3 changed files with 6 additions and 6 deletions

View File

@ -3,7 +3,7 @@ name: Weblate Update
on:
push:
branches:
- master
- main
jobs:
trigger-update:

View File

@ -175,8 +175,8 @@ if [ "$manage_remote" == true ]; then
git checkout -b pull/$PR_NUMBER $PR_AUTHOR/$PR_BRANCH
fi
# Attempt to merge master, should fail
git merge --no-ff --no-commit origin/master || true
# Attempt to merge main, should fail
git merge --no-ff --no-commit origin/main || true
if [ ! -f .git/MERGE_HEAD ]; then
echo "Merge aborted or succeeded for some unknown reason. Cancelling pull request resolution"
@ -207,7 +207,7 @@ while IFS= read -r line; do
done <<< "$GIT_STATUS"
# Finish the merge
echo -e "Update with base 'origin/master'\n\nResolves source catalog conflicts" > .git/MERGE_MSG
echo -e "Update with base 'origin/main'\n\nResolves source catalog conflicts" > .git/MERGE_MSG
GIT_EDITOR=true git merge --continue
if [ "$manage_remote" == true ]; then

View File

@ -38,8 +38,8 @@ FETCHED_REPOS=();
for repo_name in "${SOURCE_REPOSITORIES[@]}"; do
if [ ! -d "sources.d/$repo_name" ]; then
FETCHED_REPOS+=( $repo_name );
wget -q -O - https://github.com/Icinga/$repo_name/archive/master.tar.gz | tar xz
mv $repo_name-master/ sources.d/$repo_name
wget -q -O - https://github.com/Icinga/$repo_name/archive/main.tar.gz | tar xz
mv $repo_name-main/ sources.d/$repo_name
fi
done