tyler.durden/L10n
1
0
Fork 0
mirror of https://github.com/Icinga/L10n.git synced 2025-07-29 16:54:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update references for branch master to refer to main

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/weblate-update.yml vendored
View File

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

6
bin/autoresolve
View File

@ -175,8 +175,8 @@ if [ "$manage_remote" == true ]; then
git checkout -b pull/$PR_NUMBER $PR_AUTHOR/$PR_BRANCH git checkout -b pull/$PR_NUMBER $PR_AUTHOR/$PR_BRANCH
fi fi
# Attempt to merge master, should fail # Attempt to merge main, should fail
git merge --no-ff --no-commit origin/master || true git merge --no-ff --no-commit origin/main || true
if [ ! -f .git/MERGE_HEAD ]; then if [ ! -f .git/MERGE_HEAD ]; then
echo "Merge aborted or succeeded for some unknown reason. Cancelling pull request resolution" 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" done <<< "$GIT_STATUS"
# Finish the merge # 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 GIT_EDITOR=true git merge --continue
if [ "$manage_remote" == true ]; then if [ "$manage_remote" == true ]; then

4
bin/update
View File

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