-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Update (or create) opentelemetrybot/semantic-conventions-v*
branch daily
#6081
Update (or create) opentelemetrybot/semantic-conventions-v*
branch daily
#6081
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed since going in a different direction now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer that the scripts work on a PR branch rather than a dedicated and "permanent" repo branch. We don't need to preserve a continuous history of semconv integration as a part of this repo. A PR branch seems more appropriate IMHO.
Thoughts?
would naming it I could have the script automatically create the branch (and associated PR) if it doesn't find one (meaning we've rolled over to the next release) |
Yes, I'd like that: a branch per release that can be closed once the release has landed (hence it becomes a PR branch). Thanks! |
515595b
to
7f2a912
Compare
7f2a912
to
5311ace
Compare
integration/semantic-conventions
branch dailyopentelemetrybot/semantic-conventions-v*
branch daily
done, ptal, thanks! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for working on this. See inline comments.
git config user.name opentelemetrybot | ||
git config user.email 107717825+opentelemetrybot@users.noreply.github.com | ||
|
||
- name: Rebase |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, I'm not sure that I'd want to automatically rebase the otel.io repo (that is what this is doing, right?). My gut feeling is that we might want to do this by hand. Maybe introduce a script bool argument to control this? Or just omit it and we can do it fully manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's merging from main (no force pushing involved), I can remove it if you'd prefer to do it by hand for now
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd prefer rebasing, to keep the PR branch clean, and make it easier to cherry pick if/once we want to create a final PR.
But let's leave this as is for now. We can revisit later if necessary.
|
||
- name: Update submodule | ||
run: | | ||
git submodule update --init content-modules/semantic-conventions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, we should be running npm run get:submodule
, but that would require that in this step we not only update the submodule commit, but that we change the value of semconv-pin
to correspond to the value returned by git describe --tags
. Can we do that further below in this step?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I updated semconv-pin
now, but I'm not sure what npm run get:submodule
is for, or when to run it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, npm run get:submodule
is mainly to help local devs sync their submodules to the pinned versions. Come to think of it, we won't need it here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking forward to giving this a spin.
Attempting to automate parts of open-telemetry/semantic-conventions#1817
This daily action will check if there's an existing
opentelemetrybot/semantic-conventions-v*
branch, and update that branch with the latest frommain
and update the semconv submodule with the latest from that repo'smain
.If there's no existing
opentelemetrybot/semantic-conventions-v*
branch, it will create one and open a draft PR against it.cc @open-telemetry/specs-semconv-maintainers