Skip to content

fix: use path-specific commit message in sync script #890

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

Merged
robdecker merged 1 commit into from
Mar 11, 2026
Merged

fix: use path-specific commit message in sync script #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions MAINTAINING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ While maintaining releases for packages, starters and examples is done with Lern
"sync:modules": "./scripts/sync-repo.sh 3.x git@git.drupal.org:project/ \"modules/*\"",
```

2. Run `yarn sync:modules` to sync the latest commit on `main` with the git repo on drupal.org. All recent changes will be squashed into a commit using the latest commit message.
2. Run `yarn sync:modules` to sync the latest commit on `main` with the git repo on drupal.org. All recent changes will be squashed into a commit using the most recent commit message that touched the synced path.

3. On Drupal.org’s GitLab, [tag a release](https://git.drupalcode.org/project/next/-/tags/new) following the [“Release tags naming conventions” docs](https://www.drupal.org/docs/develop/git/git-for-drupal-project-maintainers/release-naming-conventions#release-tags).

Expand Down Expand Up @@ -131,7 +131,7 @@ The code in the examples repos do not strictly require a versioned release since
yarn sync:examples
```

All recent changes on `main` will be squashed into a commit on the target git repo using the latest commit message.
All recent changes on `main` will be squashed into a commit on the target git repo using the most recent commit message that touched the synced path.

### Starters

Expand All @@ -158,7 +158,7 @@ The code in the examples repos do not strictly require a versioned release since
yarn sync:starters:release
```

All recent changes on `main` will be squashed into a commit on the target git repo using the latest commit message.
All recent changes on `main` will be squashed into a commit on the target git repo using the most recent commit message that touched the synced path.

4. **Create a GitHub release and tag**

Expand Down
5 changes: 4 additions & 1 deletion scripts/sync-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ BRANCH=$(echo $BRANCHES | cut -d "," -f 1)
TRACKING_BRANCH=$(echo $BRANCHES | cut -d "," -f 2)

BASE=$(pwd)
COMMIT_MESSAGE=$(git log -1 --pretty=%B)
COMMIT_MESSAGE=$(git log -1 --pretty=%B -- $GLOB)
if [ -z "$COMMIT_MESSAGE" ]; then
COMMIT_MESSAGE=$(git log -1 --pretty=%B)
fi

for folder in $GLOB; do
[ -d "$folder" ] || continue
Expand Down
Loading