Skip to content

Stick to GHC 8.10.7 in CI until changelog-d is updated and update CI job names to permit making them mandatory in Settings (backport #8505) #8514

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

Merged
merged 2 commits into from
Oct 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2022

This is an automatic backport of pull request #8505 done by Mergify.

@ulysses4ever
Copy link
Collaborator

@mergify rebase

@mergify
Copy link
Contributor Author

mergify bot commented Oct 6, 2022

rebase

✅ Branch has been successfully rebased

@andreabedini andreabedini force-pushed the mergify/bp/3.8/pr-8505 branch from 5846af9 to 5514aab Compare October 6, 2022 23:46
@ulysses4ever ulysses4ever added merge me Tell Mergify Bot to merge and removed conflicts labels Oct 6, 2022
@ulysses4ever
Copy link
Collaborator

ulysses4ever commented Oct 6, 2022

Oh, funny: seems GitHub uses CI config from master even on PRs for 3.8, but 3.8 doesn't have the whitespace job's config, so that job fails. I guess, we'd need to backport the whitespace job to 3.8 first (or ignore that it's failing). No, this PR somehow introduces the whitespace job.

@ulysses4ever
Copy link
Collaborator

ulysses4ever commented Oct 6, 2022

Although, I don't understand then how #8513 ended up doing fine: it didn't have the whitespace job ran on it. Why this PR has it?

Edit: the answer is: because the corresponding commit touched the whitespace job config file.

… sees it

(cherry picked from commit bbaa2b1)

# Conflicts:
#	.github/workflows/whitespace.yml
@ulysses4ever ulysses4ever force-pushed the mergify/bp/3.8/pr-8505 branch from 5514aab to 61884f5 Compare October 7, 2022 13:28
@ulysses4ever
Copy link
Collaborator

So, restricting the original PR (#8505) by removing any mention of the whitespace job seems to be the easiest way forward.

@mergify mergify bot merged commit 1363f6a into 3.8 Oct 7, 2022
@mergify mergify bot deleted the mergify/bp/3.8/pr-8505 branch October 7, 2022 15:11
@Mikolaj
Copy link
Member

Mikolaj commented Oct 24, 2022

Phew. I had no idea I left such a mess behind when leaving for a travel. ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants