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

Bump IOGX v2.0 #619

Merged
merged 25 commits into from
Jun 22, 2023
Merged

Bump IOGX v2.0 #619

merged 25 commits into from
Jun 22, 2023

Conversation

zeme-wana
Copy link
Contributor

@zeme-wana zeme-wana commented Jun 19, 2023 •
edited
Loading

Notable changes:

  • Removed stylish-haskell,hindent and tidyrc in favour of fourmolu and editorconfig.
  • Added support for adding extra flags to cabal-fmt (namely --no-tabular)
  • Upgraded IOGX to new interface Version 2.0 (filesystem-based interface) iogx#2
  • Now building oci-images in hydra

@zeme-wana
Copy link
Contributor Author

In order to start using fourmolu and editorconfig, run pre-commit run --all after checking out this PR and entering nix develop.
Modify the .editorconfig and fourmolu.yaml files accordingly.
hlint is also enabled and will return tens of warnings -> edit .hlint.yaml accordingly.
It's possible that fourmolu and editorconfig will fight one another -> you can disable editorconfig in ./nix/pre-commit-check.nix

@zeme-wana zeme-wana mentioned this pull request Jun 19, 2023
Merged
jhbertra
jhbertra reviewed Jun 19, 2023
View reviewed changes
fourmolu.yaml Outdated
Comment on lines 1 to 17
indentation: 2
column-limit: none
function-arrows: trailing
comma-style: trailing
import-export-style: trailing
indent-wheres: true
record-brace-space: true
newlines-between-decls: 1
haddock-style: single-line
haddock-style-module: null
let-style: inline
in-style: right-align
single-constraint-parens: always
unicode: never
respectful: false
fixities: []
reexports: []
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
indentation: 2
column-limit: none
function-arrows: trailing
comma-style: trailing
import-export-style: trailing
indent-wheres: true
record-brace-space: true
newlines-between-decls: 1
haddock-style: single-line
haddock-style-module: null
let-style: inline
in-style: right-align
single-constraint-parens: always
unicode: never
respectful: false
fixities: []
reexports: []
indentation: 2
column-limit: 120
function-arrows: leading
haddock-style: single-line
let-style: inline

This would be my preferred config. It mostly uses defaults with a few exceptions.

Copy link
Contributor

Choose a reason for hiding this comment

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

This change seems to have been reverted

jhbertra
jhbertra reviewed Jun 19, 2023
View reviewed changes
nix/hydra-jobs.nix Outdated

"networks"
"nomadTasks"
"operables"
Copy link
Contributor

Choose a reason for hiding this comment

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

We could build these too (they will get build as part of the oci-images, but having them as hydra-jobs might come in handy (to see the exact store paths for example)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok let's see what hydra thinks

jhbertra
jhbertra reviewed Jun 19, 2023
View reviewed changes
nix/iogx-config.nix Outdated
@@ -0,0 +1,15 @@
{
debug = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this be false?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no difference, it's disappearing in the next push to this PR.

@zeme-wana zeme-wana force-pushed the zeme-wana/iogx-fs branch 2 times, most recently from 7d2bb85 to b44e8ee Compare June 21, 2023 21:23
@zeme-wana
Copy link
Contributor Author

zeme-wana commented Jun 21, 2023 •
edited
Loading

I removed networks and nomadTasks from CI because they are not derivations and so they can't be built.

However oci-images and operables are now part of CI.

Note that nix/marlowe-cardano/networks.nix has problems:

  testnet-pioneers = mkNetwork environments.marlowe-pioneers // {
    magic = 1567;
  };
  testnet-dev = mkNetwork environments.marlowe-dev // {
    magic = 1566;
  };

environments.marlowe-pioneers and environments.marlowe-dev are invalid: marlowe-pioneers and marlowe-dev are missing from environments from the more recent version of iohk-nix.
See here for the list of available environments:
https://github.com/input-output-hk/iohk-nix/blob/02f42375ee5c2bab1640f14c6389b7e91bbfec8b/cardano-lib/default.nix#L85
I temporarily removed them from CI

Some oci-images derivations also fail to build.
Test these locally:

nix build .#hydraJobs.oci-images.all.copyToDockerDaemon.x86_64-linux
nix build .#hydraJobs.oci-images.marlowe-chain-indexer.x86_64-linux

@zeme-wana zeme-wana marked this pull request as ready for review June 21, 2023 21:48
@zeme-wana zeme-wana added the No Changelog Required Turns of the check-changelog check label Jun 21, 2023
@jhbertra jhbertra merged commit 52df6bd into main Jun 22, 2023
2 checks passed
@jhbertra jhbertra deleted the zeme-wana/iogx-fs branch June 22, 2023 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jhbertra jhbertra jhbertra left review comments

Assignees
No one assigned
Labels
No Changelog Required Turns of the check-changelog check
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zeme-wana @jhbertra @shlevy