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

Generate doc/buildinfo-fields-reference.rst #9573

Merged
merged 9 commits into from
Jan 1, 2024

Conversation

philderbeast
Copy link
Collaborator

@philderbeast philderbeast commented Dec 28, 2023

Helps with #9186. Revives the buildinfo-reference-generator package, replaces a PHONY target with doc/buildinfo-fields-reference.rst as the target in the Makefile and updates a field reference. Includes the output generated by the Makefile recipe, doc/buildinfo-fields-reference.rst.

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, etc.)

Include the following checklist in your PR:

To test:

$ make doc/buildinfo-fields-reference.rst --always-make

@ulysses4ever
Copy link
Collaborator

Would it be possible to add this make command to the "Quick Jobs" in the CI so that we're sure that it doesn't bitrot? I assume it's not very expensive?..

My general intention is to increase the coverage of the makefile targets in our CI when possible.

@philderbeast
Copy link
Collaborator Author

philderbeast commented Dec 28, 2023

@ulysses4ever on my machine it takes <5s to run with the project already built and about a minute to run after a cabal clean.

@ulysses4ever
Copy link
Collaborator

This is affordable.

@philderbeast
Copy link
Collaborator Author

@ulysses4ever is "Quick Jobs" the right place for it? Maybe it is something for .github/workflows/users-guide.yml?

@ulysses4ever
Copy link
Collaborator

Right, that probably makes more sense.

- Hide the section prefix
- If not prefixed, the error is: WARNING: cabal:pkg-field reference target not found: virtual-modules
@philderbeast philderbeast force-pushed the fix/gen-buildinfo-9186 branch from b1f9074 to 99412f1 Compare December 29, 2023 09:09
@philderbeast philderbeast force-pushed the fix/gen-buildinfo-9186 branch from 99412f1 to 703cda1 Compare December 29, 2023 11:00
@philderbeast philderbeast force-pushed the fix/gen-buildinfo-9186 branch 2 times, most recently from 1918628 to 106ba2c Compare December 29, 2023 13:42
@philderbeast philderbeast force-pushed the fix/gen-buildinfo-9186 branch from 106ba2c to 6e3c7f5 Compare December 29, 2023 14:04
@philderbeast
Copy link
Collaborator Author

@ulysses4ever I added a quick job, not wanting to slow down the doc job. If it fails then the output will look something like the following that shows a stray -Resolving dependencies... from a prior intentional bad check in for this test:

make: *** [Makefile:69: doc/buildinfo-fields-reference.rst] Error 1
git diff --exit-code doc/buildinfo-fields-reference.rst
diff --git a/doc/buildinfo-fields-reference.rst b/doc/buildinfo-fields-reference.rst
index afd95e8..338bbdd 100644
--- a/doc/buildinfo-fields-reference.rst
+++ b/doc/buildinfo-fields-reference.rst
@@ -1,4 +1,3 @@
-Resolving dependencies...
 .. _buildinfo-field-reference:
 
 Field Syntax Reference
Error: Process completed with exit code 2.

@philderbeast
Copy link
Collaborator Author

@ulysses4ever and @geekosaur, normally I wouldn't boost the scope of a fix but I added GHC2021 to default-language and sorted this list, newest-first.

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Thanks! Minor CI comments from me…

.github/workflows/quick-jobs.yml Outdated Show resolved Hide resolved
.github/workflows/quick-jobs.yml Show resolved Hide resolved
.github/workflows/quick-jobs.yml Show resolved Hide resolved
Cabal-described/src/Distribution/Described.hs Show resolved Hide resolved
@philderbeast
Copy link
Collaborator Author

Label merge+no rebase is necessary when the pull request is from an organisation.

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jan 1, 2024
@mergify mergify bot merged commit 12223d7 into haskell:master Jan 1, 2024
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge+no rebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants