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

Workaround archlinux jq failure #525

Merged
merged 3 commits into from
Jun 9, 2024
Merged

Workaround archlinux jq failure #525

merged 3 commits into from
Jun 9, 2024

Conversation

jayvdb
Copy link
Contributor

@jayvdb jayvdb commented Jun 9, 2024

Fixes #521

@jayvdb jayvdb marked this pull request as ready for review June 9, 2024 01:56
@jayvdb
Copy link
Contributor Author

jayvdb commented Jun 9, 2024

@taiki-e @NobodyXu this is green now

NobodyXu
NobodyXu requested changes Jun 9, 2024
View reviewed changes
manifests/dprint.json Show resolved Hide resolved
@jayvdb
Copy link
Contributor Author

jayvdb commented Jun 9, 2024

That is a catch-22 - the scheduled CI failed because of this https://github.com/taiki-e/install-action/actions/runs/9433528539

@NobodyXu
Copy link
Collaborator

NobodyXu commented Jun 9, 2024 •
edited
Loading

So we need this PR to merge for the CI to run and auto-merge.

@NobodyXu
Copy link
Collaborator

NobodyXu commented Jun 9, 2024

There's still a problem of if it will show up in the commit history.

@jayvdb Could you clean up the commit history a bit?

I think doing a rebase merge might make more sense, to preserve the commit history.

cc @taiki-e What do you think?

@jayvdb
Copy link
Contributor Author

jayvdb commented Jun 9, 2024

I've updated the commit message of the middle commit.
The other two commits are different things, hence they are separate commits.

@jayvdb
Copy link
Contributor Author

jayvdb commented Jun 9, 2024

Green again

taiki-e
taiki-e approved these changes Jun 9, 2024
View reviewed changes
Copy link
Owner

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

Thanks!

@taiki-e taiki-e merged commit 762078b into taiki-e:main Jun 9, 2024
29 checks passed
@jayvdb jayvdb deleted the arch-glibc branch June 9, 2024 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NobodyXu NobodyXu NobodyXu requested changes

@taiki-e taiki-e taiki-e approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

archlinux test container is broken: jq now requires GLIBC_2.39
3 participants
@jayvdb @NobodyXu @taiki-e