Skip to content

[pull] main from liveblocks:main #340

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 30, 2026
Merged

[pull] main from liveblocks:main #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d43250e
Allow releasing DevTools without a changelog entry (#3628)
marcbouchenoire Jul 30, 2026
568400b
Fix release script flag parsing (#3631)
marcbouchenoire Jul 30, 2026
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
19 changes: 14 additions & 5 deletions .github/scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ err () {
}

usage () {
err "usage: release.sh [-h] [-V <version>] [-p] [-m <message>] [-f] [-w] <pkgdir> [<pkgdir>...]"
err "usage: release.sh [-h] [-V <version>] [-p] [-m <message>] [-f] [-w] [-c] <pkgdir> [<pkgdir>...]"
err
err "Prepare a release by updating files in this repo."
err "Run this prior to publishing to NPM (or elsewhere, e.g. DevTools)."
Expand All @@ -18,6 +18,7 @@ usage () {
err " -m improve the commit message by specifying what was bumped"
err " -f force version update (use --force flag with npm version)"
err " -w disable workspace updates (use --workspaces-update false with npm version)"
err " -c check and update CHANGELOG.md"
err ""
}

Expand All @@ -26,13 +27,15 @@ PUSH_COMMIT="false"
COMMIT_MESSAGE="Bump to "
FORCE_FLAG=""
WORKSPACES_UPDATE_FLAG=""
while getopts V:p:m:fwh flag; do
UPDATE_CHANGELOG="false"
while getopts V:pm:fwch flag; do
case "$flag" in
V) VERSION=$OPTARG;;
p) PUSH_COMMIT="true";;
m) COMMIT_MESSAGE=$OPTARG;;
f) FORCE_FLAG="--force";;
w) WORKSPACES_UPDATE_FLAG="--workspaces-update false";;
c) UPDATE_CHANGELOG="true";;
*) usage; exit 2;;
esac
done
Expand Down Expand Up @@ -177,7 +180,9 @@ inject_changelog_heading () {
check_is_valid_version "$VERSION"

# Fail fast if a heading is due for this release but vNEXT has no entries
assert_changelog_ready "$ROOT/CHANGELOG.md"
if [ "$UPDATE_CHANGELOG" = "true" ]; then
assert_changelog_ready "$ROOT/CHANGELOG.md"
fi

# Run a fresh install to ensure the lock file isn't outdated before continuing
pnpm install --no-frozen-lockfile
Expand All @@ -191,6 +196,10 @@ done
pnpm install --no-frozen-lockfile

# Add a CHANGELOG heading for this release if one doesn't exist yet
inject_changelog_heading "$ROOT/CHANGELOG.md"
FILES_TO_COMMIT=("pnpm-lock.yaml" "packages/" "tools/")
if [ "$UPDATE_CHANGELOG" = "true" ]; then
inject_changelog_heading "$ROOT/CHANGELOG.md"
FILES_TO_COMMIT+=("CHANGELOG.md")
fi

commit_to_git "${COMMIT_MESSAGE}${VERSION}" "pnpm-lock.yaml" "packages/" "tools/" "CHANGELOG.md"
commit_to_git "${COMMIT_MESSAGE}${VERSION}" "${FILES_TO_COMMIT[@]}"
2 changes: 1 addition & 1 deletion .github/workflows/publish-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
VERSION: ${{steps.version.outputs.value}}

run:
./.github/scripts/release.sh -V "$VERSION" -w
./.github/scripts/release.sh -V "$VERSION" -w -c
"packages/liveblocks-core" "packages/liveblocks-client"
"packages/liveblocks-node" "packages/liveblocks-chat-sdk-adapter"
"packages/liveblocks-react"
Expand Down
Loading