Skip to content

fix(release): accept both Memmy release branch formats #286

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
MLittleprince wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(release): accept both Memmy release branch formats #286

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
9 changes: 5 additions & 4 deletions .github/workflows/github-draft-release-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
github.event_name == 'workflow_dispatch' ||
(github.event.pull_request.merged == true &&
github.event.pull_request.head.repo.full_name == github.repository &&
startsWith(github.event.pull_request.head.ref, 'release/v'))
(startsWith(github.event.pull_request.head.ref, 'v') ||
startsWith(github.event.pull_request.head.ref, 'release/v')))
concurrency:
# Tag and Draft Release mutations are repository-global. Queue automatic
# and manual recovery runs so they cannot mutate assets concurrently.
Expand Down Expand Up @@ -69,11 +70,11 @@ jobs:
create_draft="false"
manual_target_sha_supplied="false"
if [[ "$EVENT_NAME" == "pull_request_target" ]]; then
if [[ ! "$PR_HEAD_REF" =~ ^release/v((0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*))$ ]]; then
echo "Release branch must match release/vX.Y.Z" >&2
if [[ ! "$PR_HEAD_REF" =~ ^(release/)?v((0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*))$ ]]; then
echo "Release branch must match vX.Y.Z or release/vX.Y.Z" >&2
exit 1
fi
version="${BASH_REMATCH[1]}"
version="${BASH_REMATCH[2]}"
target_sha="$PR_MERGE_SHA"
preflight_level="full"
create_draft="true"
Expand Down
12 changes: 6 additions & 6 deletions tests/release-workflow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe("GitHub Draft Release v2 workflow", () => {
}
});

it("creates Draft Releases only from merged release/vX.Y.Z PRs and keeps manual fallback", () => {
it("creates Draft Releases only from merged vX.Y.Z or release/vX.Y.Z PRs and keeps manual fallback", () => {
expect(draftWorkflow.on.pull_request_target).toEqual({
types: ["closed"],
branches: ["main"],
Expand All @@ -252,17 +252,17 @@ describe("GitHub Draft Release v2 workflow", () => {
"github.event_name == 'workflow_dispatch' || " +
"(github.event.pull_request.merged == true && " +
"github.event.pull_request.head.repo.full_name == github.repository && " +
"startsWith(github.event.pull_request.head.ref, 'release/v'))",
"(startsWith(github.event.pull_request.head.ref, 'v') || " +
"startsWith(github.event.pull_request.head.ref, 'release/v')))",
);

const resolve = draftScript("Resolve and validate release");
expect(resolve).toContain('if [[ "$EVENT_NAME" == "pull_request_target" ]]');
expect(resolve).toContain(
"^release/v((0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*))$",
"^(release/)?v((0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*))$",
);
expect(resolve).toContain("Release branch must match release/vX.Y.Z");
expect(resolve).not.toContain("vX.Y.Z or release/vX.Y.Z");
expect(resolve).toContain('version="${BASH_REMATCH[1]}"');
expect(resolve).toContain("Release branch must match vX.Y.Z or release/vX.Y.Z");
expect(resolve).toContain('version="${BASH_REMATCH[2]}"');
expect(resolve).toContain('target_sha="$PR_MERGE_SHA"');
expect(resolve).toContain('preflight_level="full"');
expect(resolve).toContain('create_draft="true"');
Expand Down