Skip to content

Improve flake code #1743

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
Merged
merged 9 commits into from
Oct 11, 2022
Merged

Improve flake code #1743

merged 9 commits into from
Oct 11, 2022

Conversation

hamishmack
Copy link
Collaborator

Also moves the rawFlake code into a haskellLib.mkFlake function

@hamishmack
Add hydraJobs.devShell and flatten hydraJobs
71cb0b9 
Also moves the `rawFlake` code into a `haskellLib.mkFlake` function
@hamishmack hamishmack requested a review from michaelpj October 7, 2022 07:01
@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Oct 7, 2022
@iohk-bors
Try #1743:
4b28d65
@hamishmack
Copy link
Collaborator Author

I moved rawFlake code into a stand alone mkFlake function while I needed to fix it up, I'll tackle the .flake', .flake and .shell in another PR.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 7, 2022

try

Build succeeded:

@hamishmack
Unflatten hydraJobs and add ciJobs
aa4a3a2 
It turns out it is nice to use system first in the hierarchy for cicero.  Also both hydra and cicero are ok with a deep hierarchy of attributes.
@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Oct 7, 2022
@iohk-bors
Try #1743:
0cdf939
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 7, 2022

try

Build succeeded:

michaelpj
michaelpj approved these changes Oct 7, 2022
View reviewed changes
Copy link
Collaborator

@michaelpj michaelpj left a comment

Choose a reason for hiding this comment

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

❤️

@michaelpj
Copy link
Collaborator

Some of this is just review comments on the rawFlake code that I hadn't seen before, sorry!

@michaelpj
Copy link
Collaborator

These top-level functions I'm suggesting would be very useful for us in IntersectMBO/plutus#4877, where we're basically putting together our own flake, but all these pieces would be quite useful!

@michaelpj michaelpj mentioned this pull request Oct 7, 2022
Merged
3 tasks
michaelpj
michaelpj reviewed Oct 7, 2022
View reviewed changes
@hamishmack hamishmack changed the title Add hydraJobs.devShell and flatten hydraJobs Improve flake code Oct 10, 2022
michaelpj
michaelpj approved these changes Oct 10, 2022
View reviewed changes
Copy link
Collaborator

@michaelpj michaelpj left a comment

Choose a reason for hiding this comment

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

Looking great, just a bit more nitpicking!

@michaelpj michaelpj mentioned this pull request Oct 10, 2022
Closed
@hamishmack
Avoid : in ciJobs and hydraJobs
b662ab4
@hamishmack
Use cabal names again in ciJobs
6f5dd01
@hamishmack
More updates
41da1b8 
Turns off code coverage by default.
Rename flattenChecks to mkFlakeChecks.
Adds flake packages to ciJobs and hydraJobs.
@hamishmack
Expand comment
e08a9c9
@hamishmack
Copy link
Collaborator Author

bors try

iohk-bors bot added a commit that referenced this pull request Oct 11, 2022
@iohk-bors
Try #1743:
e55b43c
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Oct 11, 2022

try

Build succeeded:

@hamishmack hamishmack merged commit a070082 into master Oct 11, 2022
@iohk-bors iohk-bors bot deleted the hkm/flake-improvements branch October 11, 2022 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelpj michaelpj michaelpj 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.
2 participants
@hamishmack @michaelpj