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.

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

chore(release): switch from msr to changesets #2362

Merged
merged 2 commits into from
Oct 15, 2024
Merged

chore(release): switch from msr to changesets #2362

merged 2 commits into from
Oct 15, 2024

Conversation

schultzp2020
Copy link
Member

Signed-off-by: Paul Schultz <pschultz@pobox.com>
@schultzp2020 schultzp2020 requested review from a team as code owners October 15, 2024 19:35
@openshift-ci openshift-ci bot removed the lgtm label Oct 15, 2024
Copy link

@schultzp2020
Copy link
Member Author

/override "Test-build with Node.js 20"

Copy link

openshift-ci bot commented Oct 15, 2024

@schultzp2020: Overrode contexts on behalf of schultzp2020: Test-build with Node.js 20

In response to this:

/override "Test-build with Node.js 20"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@nickboldt nickboldt self-requested a review October 15, 2024 20:10
@openshift-ci openshift-ci bot added the lgtm label Oct 15, 2024
@nickboldt nickboldt merged commit a39d9f0 into main Oct 15, 2024
8 of 9 checks passed
@nickboldt nickboldt deleted the remove-msr branch October 15, 2024 20:11
@nickboldt
Copy link
Member

Followup PR for openshift CI prow config:

https://github.com/openshift/release/pull/57860/files

@nickboldt
Copy link
Member

/cherry-pick release-1.3

@openshift-cherrypick-robot

@nickboldt: #2362 failed to apply on top of branch "release-1.3":

Applying: chore(release): switch from msr to changesets
Using index info to reconstruct a base tree...
M	.github/workflows/pr.yaml
M	.github/workflows/push.yaml
M	package.json
M	yarn.lock
Falling back to patching base and 3-way merge...
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging .github/workflows/release.yaml
CONFLICT (content): Merge conflict in .github/workflows/release.yaml
Auto-merging .github/workflows/pr-build.yaml
CONFLICT (content): Merge conflict in .github/workflows/pr-build.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore(release): switch from msr to changesets

In response to this:

/cherry-pick release-1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

schultzp2020 added a commit that referenced this pull request Oct 15, 2024
Signed-off-by: Paul Schultz <pschultz@pobox.com>
Co-authored-by: Nick Boldt <nboldt@redhat.com>
schultzp2020 added a commit that referenced this pull request Oct 15, 2024
* chore(ci): cherry-pick of b6c8a50

Signed-off-by: Paul Schultz <pschultz@pobox.com>

* chore(release): switch from msr to changesets (#2362)

Signed-off-by: Paul Schultz <pschultz@pobox.com>
Co-authored-by: Nick Boldt <nboldt@redhat.com>

* add changeset

Signed-off-by: Paul Schultz <pschultz@pobox.com>

---------

Signed-off-by: Paul Schultz <pschultz@pobox.com>
Co-authored-by: Nick Boldt <nboldt@redhat.com>
openshift-merge-bot bot pushed a commit to openshift/release that referenced this pull request Oct 16, 2024
* Update _prowconfig.yaml to use new changeset actions

followup to janus-idp/backstage-plugins#2362 for https://issues.redhat.com/browse/RHIDP-4430

* Update _prowconfig.yaml - apply to 1.2 and 1.3 branches too
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants