Skip to content

v3.2-dev: sync with dev #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: v3.2-dev
Choose a base branch
from
Open

v3.2-dev: sync with dev #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55336a3
Update sync-dev-to-vX.Y-dev.yaml
ralfhandl Oct 4, 2025
d1adae6
Merge main into dev-sync-with-main
cincrement Oct 4, 2025
9679a47
Merge pull request #72 from ralfhandl/dev-sync-with-main
ralfhandl Oct 4, 2025
cc5cecf
Merge dev into v3.2-dev-sync-with-dev
cincrement Oct 4, 2025
1dd2996
Bot username and email
ralfhandl Oct 5, 2025
062ef98
Merge main into dev-sync-with-main
github-actions[bot] Oct 5, 2025
d8af546
Merge pull request #74 from ralfhandl/dev-sync-with-main
ralfhandl Oct 5, 2025
f30a0d6
Merge dev into v3.2-dev-sync-with-dev
github-actions[bot] Oct 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/sync-dev-to-vX.Y-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
id: pull_requests
shell: bash
run: |
git config user.name ${GITHUB_ACTOR}
git config user.email "[email protected]"
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"

DEV_BRANCHES=$(git branch -r --list origin/v?.?-dev)
for DEV_BRANCH in $DEV_BRANCHES; do
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-main-to-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
id: pull_request
shell: bash
run: |
git config user.name ${GITHUB_ACTOR}
git config user.email "[email protected]"
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
SYNC="$BASE-sync-with-$HEAD"

git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
Expand Down