Fix libs workflow
This commit is contained in:
10
.github/workflows/libs.yml
vendored
10
.github/workflows/libs.yml
vendored
@@ -46,14 +46,18 @@ jobs:
|
|||||||
}
|
}
|
||||||
git config --local user.email "$bot_user_id+github-actions[bot]@users.noreply.github.com"
|
git config --local user.email "$bot_user_id+github-actions[bot]@users.noreply.github.com"
|
||||||
git config --local user.name "github-actions[bot]"
|
git config --local user.name "github-actions[bot]"
|
||||||
git add .
|
if [ "$(git status --porcelain=v1 2>/dev/null | wc -l)" != "0" ]; then
|
||||||
git commit -m "Updating lists"
|
git add .
|
||||||
|
git commit -m "Updating lists"
|
||||||
|
fi
|
||||||
push_ref develop
|
push_ref develop
|
||||||
semver=$(git tag --sort=-refname | awk 'match($0, /^[0-9]+\.[0-9]+\.[0-9]+$/)' | head -n 1)
|
semver=$(git tag --sort=-refname | awk 'match($0, /^[0-9]+\.[0-9]+\.[0-9]+$/)' | head -n 1)
|
||||||
rolling=$(git tag --sort=-refname | awk 'match($0, /^v[0-9]/)' | head -n 1)
|
rolling=$(git tag --sort=-refname | awk 'match($0, /^v[0-9]/)' | head -n 1)
|
||||||
for branch in master releases/$rolling; do
|
for branch in master releases/$rolling; do
|
||||||
git checkout $branch
|
git checkout $branch
|
||||||
git merge --allow-unrelated-histories develop
|
if [ "$(git rev-parse "$branch")" != "$(git rev-parse develop)" ]; then
|
||||||
|
git merge --allow-unrelated-histories develop || true
|
||||||
|
fi
|
||||||
push_ref "$branch"
|
push_ref "$branch"
|
||||||
done
|
done
|
||||||
for tag in $semver $rolling; do
|
for tag in $semver $rolling; do
|
||||||
|
|||||||
Reference in New Issue
Block a user