merge queue: embarking master (6f8bd97) and #2394 together#2395
Closed
mergify[bot] wants to merge 9 commits intomasterfrom
Closed
merge queue: embarking master (6f8bd97) and #2394 together#2395mergify[bot] wants to merge 9 commits intomasterfrom
mergify[bot] wants to merge 9 commits intomasterfrom
Conversation
At some point, this support must have disappeared. If the haddock attribute goes away completely, then we can remove the code that checks for it. Cabal args and the attribute work together and either can disable haddock.
A couple of features of the stack_snapshot module extension just didn't work. Fix them
The version from bazel_tools is deprecated and has been removed in bazel 8+ There is a version from rules_cc, from 0.1.1 onwards, but we already have a private version in this repository. Use it everywhere appropriate. Updating the rules_cc depedency is not straightforward.
Bazel 8 may produce an executable path that begins with "..". Make the package extraction work correctly with this type of path. Bump the bazel-runfiles version number in the cabal file.
bazel behaves slightly differently when requesting runfiles from an external repository. Add a test case for that scenario. The test case is part of a tar archive. It could be a local repository, but only once the minimum bazel version is 7.2+. Fortunately bazel accepts the de-facto relative file url standard, so there is no need to resort to pulling the archive down over http.
The previous code used the dirname of the cabal file, which really wasn't the correct thing to use. What the runfiles library is really looking for is the cabal directory _relative_ to the repository name. Pass in the repository from the label of the cabal library/executable currently being built. Use that to find the correct relative location for external repositories.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ The merge conditions cannot be satisfied due to failing checks. ✨
Branch master (6f8bd97) and #2394 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #2394.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-neutral = all_ci_testscheck-skipped = all_ci_testscheck-success = all_ci_tests#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]check-success = deploy/netlifycheck-neutral = deploy/netlifycheck-skipped = deploy/netlifyRequired conditions to stay in the queue:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]base=masterlabel=merge-queuecheck-success = deploy/netlifycheck-neutral = deploy/netlifycheck-skipped = deploy/netlifycheck-success = all_ci_testscheck-neutral = all_ci_testscheck-skipped = all_ci_tests