Skip to content

Test and fix CI for the 1.68 branch (23.06)#147

Merged
bors-ferrocene[bot] merged 4 commits intorelease/1.68from
pa-chicken-egg-168
Nov 30, 2023
Merged

Test and fix CI for the 1.68 branch (23.06)#147
bors-ferrocene[bot] merged 4 commits intorelease/1.68from
pa-chicken-egg-168

Conversation

@emilyalbini
Copy link
Contributor

This PR is the equivalent of #36 for the 1.68 branch, which contains the source code of Ferrocene 23.06.x.

We want Ferrocene's bors instance as the author email for merge commits,
but in the squashed repository there is no commit with that email yet,
causing CI to fail. This should be reverted as soon as a PR is merged
into the squashed repository.

This also changes the fetch depth to ensure we pick up a
bors@rust-lang.org commit.
@emilyalbini
Copy link
Contributor Author

Removed some files I forgot to delete during the squash.

Copy link
Member

@tshepang tshepang left a comment

Choose a reason for hiding this comment

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

bors merge

bors-ferrocene bot added a commit that referenced this pull request Nov 30, 2023
147: Test and fix CI for the 1.68 branch (23.06) r=tshepang a=pietroalbini

This PR is the equivalent of #36 for the 1.68 branch, which contains the source code of Ferrocene 23.06.x.

Co-authored-by: Pietro Albini <pietro.albini@ferrous-systems.com>
@bors-ferrocene
Copy link
Contributor

Build failed:

@emilyalbini
Copy link
Contributor Author

Ok there was one last set of files that had to be deleted. This time I verified there are no extra files in this repo compared to the squashed one with:

diff -u <(git -C ferrocene-prehistory ls-files) <(git -C ferrocene ls-files)

Copy link
Member

@tshepang tshepang left a comment

Choose a reason for hiding this comment

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

bors merge

@bors-ferrocene
Copy link
Contributor

Build succeeded:

  • full

@bors-ferrocene bors-ferrocene bot merged commit 28ac22b into release/1.68 Nov 30, 2023
@bors-ferrocene bors-ferrocene bot deleted the pa-chicken-egg-168 branch November 30, 2023 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants