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

ci: Preliminary support for GitHub merge queues #37

Merged
merged 1 commit into from Aug 10, 2023
Merged

ci: Preliminary support for GitHub merge queues #37

merged 1 commit into from Aug 10, 2023

Conversation

blampe
Copy link
Collaborator

@blampe blampe commented Aug 9, 2023

It occurred to me that @AaronFriel had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681.

@abhinav
Copy link

abhinav commented Aug 9, 2023

RE: lint failure: actionlint probably needs to be updated https://github.com/pulumi/watchutil-rs/blob/main/.github/workflows/ci-lint.yml#L25C18-L25C45

@blampe blampe added the impact/no-changelog-required This issue doesn't require a CHANGELOG update label Aug 9, 2023
@github-actions
Copy link

github-actions bot commented Aug 9, 2023

Changelog

n/a

@blampe
Copy link
Collaborator Author

blampe commented Aug 9, 2023

Current dependencies on/for this PR:

This comment was auto-generated by Graphite.

@blampe blampe mentioned this pull request Aug 9, 2023
@blampe
Copy link
Collaborator Author

blampe commented Aug 9, 2023

bors merge

bors bot added a commit that referenced this pull request Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe

It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681.

Co-authored-by: Bryce Lampe <bryce@pulumi.com>
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

Build failed:

@blampe
Copy link
Collaborator Author

blampe commented Aug 9, 2023

bors retry

bors bot added a commit that referenced this pull request Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe

It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681.

Co-authored-by: Bryce Lampe <bryce@pulumi.com>
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

Build failed:

@blampe
Copy link
Collaborator Author

blampe commented Aug 9, 2023

bors retry

bors bot added a commit that referenced this pull request Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe

It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681.

Co-authored-by: Bryce Lampe <bryce@pulumi.com>
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

Build failed:

@blampe
Copy link
Collaborator Author

blampe commented Aug 9, 2023

bors merge

bors bot added a commit that referenced this pull request Aug 9, 2023
37: ci: Preliminary support for GitHub merge queues r=blampe a=blampe

It occurred to me that `@AaronFriel` had setup this repo to test Bors. It would make sense to also use it as a guinea pig for merge queues before landing pulumi/pulumi#13681.

Co-authored-by: Bryce Lampe <bryce@pulumi.com>
@bors
Copy link
Contributor

bors bot commented Aug 9, 2023

Build failed:

@@ -30,11 +31,11 @@ jobs:

./.github/scripts/set-output version "${VERSION}"
- name: Install git-cliff
uses: baptiste0928/cargo-install@bf6758885262d0e6f61089a9d8c8790d3ac3368f # v1.3.0
Copy link
Member

Choose a reason for hiding this comment

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

Curious why this is unpinned? Best practice is to pin to a commit SHA.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@AaronFriel I'm just trying to get the build passing, seems it's been red for a while. I'll change it.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@AaronFriel the remaining failure is on the release step, and I'm pretty out of my element. It seems like pu/pu migrated to cosign in pulumi/pulumi#11310, so my plan was to try porting that over to this repo. Would love to hear if you have alternatives before I go down that path.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Discussed 1:1, I've disabled the signing step.

@blampe
Copy link
Collaborator Author

blampe commented Aug 10, 2023

bors merge

@bors
Copy link
Contributor

bors bot commented Aug 10, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit d8772ce into main Aug 10, 2023
10 checks passed
@bors bors bot deleted the merge-queues branch August 10, 2023 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impact/no-changelog-required This issue doesn't require a CHANGELOG update
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants