Skip to content
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

Jump to bottom

Update tagging strategy #20753

Merged
merged 5 commits into from
Sep 23, 2024
Merged

Update tagging strategy #20753

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73145ba
Update tagging strategy
ef4 Sep 20, 2024
aa585a6
updating release docs
ef4 Sep 20, 2024
614b3c5
Update RELEASE.md, including the change to tag names
kategengler Sep 20, 2024
b1d814c
Merge pull request #20754 from emberjs/kg-update-release-md
ef4 Sep 20, 2024
e42dfbc
Update RELEASE.md
ef4 Sep 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/alpha-releases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: push tag
# Push in a way that will NOT trigger other workflows
run: git push origin v${{env.NEXT_ALPHA}}
run: git push origin v${{env.NEXT_ALPHA}}-ember-source

notify:
name: Notify Discord
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
run: pnpm vite build --mode=development

- name: Set BrowserStack Local Identifier
if: startsWith(github.ref, 'refs/tags/v')
if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently you still cannot comment on unchanged lines on github:

Do we want to run this workflow at all for changes and or tags of @glimmer/component?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The CI workflow is good test coverage for everything together, including @glimmer/component.

With #20751 we'll actually get better integration test coverage of @glimmer/component than we've ever had.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this again, I think this is wrong -- the BrowserStack Local Identifier needs to be set on any tag, not just ember-source tags, if we're still running the BrowserStack jobs

run: |
BROWSERSTACK_LOCAL_IDENTIFIER="$GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT"
echo "BROWSERSTACK_LOCAL_IDENTIFIER=$BROWSERSTACK_LOCAL_IDENTIFIER" >> $GITHUB_ENV
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
blueprint-test,
browser-test,
]
if: startsWith(github.ref, 'refs/tags/v')
if: startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-ember-source')
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup
Expand Down
4 changes: 3 additions & 1 deletion broccoli/build-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ function readPackageVersion(root) {
* @param {string} tag
*/
function parseTagVersion(tag) {
return tag && semver.parse(tag).version;
if (tag) {
return semver.parse(tag.replace(/-ember-source$/, '')).version;
}
}

/**
Expand Down
8 changes: 8 additions & 0 deletions tests/node/build-info-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ QUnit.module('parseTagVersion', () => {
tag: 'v3.1.1-beta.2',
expected: '3.1.1-beta.2',
},
{
tag: 'v3.4.4-ember-source',
expected: '3.4.4',
},
{
tag: 'v3.1.1-beta.2-ember-source',
expected: '3.1.1-beta.2',
},
].forEach(({ tag, expected }) => {
QUnit.test(JSON.stringify(tag), function (assert) {
assert.equal(parseTagVersion(tag), expected);
Expand Down