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

Misc dev env fixes #2766

Merged
merged 5 commits into from
Jul 20, 2021
Merged

Misc dev env fixes #2766

merged 5 commits into from
Jul 20, 2021

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Jul 19, 2021

Issue Number

Found while working on #2765.

Overview

This is a mixed bag of small tweaks.

  • Adds .dir-locals.el with conservative presets for Emacs users.
  • Add tracing of job names to Hydra evaluation (thanks for the tip @hamishmack)
  • Delete some unneeded code in shell.nix (thanks for the tip @jbgi @nrdxp)
  • Change scripts/gen-hie.sh to make symlinks if hie.yaml and .ghci don't exist.
  • .gitignore and .editorconfig tweaks.

@rvl rvl requested a review from sevanspowell July 19, 2021 10:06
@rvl rvl self-assigned this Jul 19, 2021
@rvl rvl force-pushed the rvl/2695/dev-env-tweaks branch from ba6024c to 82e5b64 Compare July 19, 2021 13:33
.dir-locals.el Outdated
@@ -0,0 +1,16 @@
;; Emacs settings for cardano-wallet
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggestion: I think I'd prefer if this file was renamed to .dir-locals.el.example or something similar. It's super useful to mine for ideas, but quickly diverges between programmers, and I can't imagine dealing with the merge conflicts being fun, you'd have to stash your local changes every time you pull then pop them afterwards?

That way we could contribute ideas to the example file without having to worry about breaking other's configs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes you're right.
I will remove it, and use its text as an example in our documentation.
It would be nice to have editors working properly "out of the box."
With VSCode, you can add stuff like recommended plugins and settings into the .vscode directory.
But perhaps this is too difficult to do for emacs.

@@ -59,15 +59,6 @@ let

CARDANO_NODE_CONFIGS = pkgs.cardano-node-deployments;

# If any build input has bash completions, add it to the search
Copy link
Contributor

Choose a reason for hiding this comment

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

Ooh, what makes this not necessary anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I put a link in the commit message to this: NixOS/nixpkgs#103501

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you 👍

@rvl rvl force-pushed the rvl/2695/dev-env-tweaks branch from 82e5b64 to 038f712 Compare July 20, 2021 03:14
@rvl
Copy link
Contributor Author

rvl commented Jul 20, 2021

bors r+

iohk-bors bot added a commit that referenced this pull request Jul 20, 2021
2766: Misc dev env fixes r=rvl a=rvl

### Issue Number

Found while working on #2765.

### Overview

This is a mixed bag of small tweaks.

- ~Adds `.dir-locals.el` with conservative presets for Emacs users.~
- Add tracing of job names to Hydra evaluation (thanks for the tip @hamishmack)
- Delete some unneeded code in `shell.nix` (thanks for the tip @jbgi @nrdxp)
- Change `scripts/gen-hie.sh` to make symlinks if `hie.yaml` and `.ghci` don't exist.
- `.gitignore` and `.editorconfig` tweaks.


Co-authored-by: Rodney Lorrimar <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 20, 2021

Build failed:

Failures:

  src/Test/Integration/Scenario/CLI/Network.hs:94:11: 
  1) CLI Specifications, COMMON_CLI_NETWORK, CLI_NETWORK - cardano-wallet network information
[cardano-wallet.network:Warning:50634] [2021-07-20 03:54:48.65 UTC] Connection lost with the node. Network.Socket.recvBuf: resource vanished (Connection reset by peer)
[cardano-wallet.network:Warning:50817] [2021-07-20 03:54:48.65 UTC] Connection lost with the node. Network.Socket.recvBuf: resource vanished (Connection reset by peer)
[cardano-wallet.network:Warning:50752] [2021-07-20 03:54:48.65 UTC] Connection lost with the node. Network.Socket.recvBuf: resource vanished (Connection reset by peer)
[cardano-wallet.network:Warning:50692] [2021-07-20 03:54:48.66 UTC] Connection lost with the node. Network.Socket.recvBuf: resource vanished (Connection reset by peer)
[cardano-wallet.network:Warning:2297] [2021-07-20 03:54:48.66 UTC] Connection lost with the node. writev: resource vanished (Broken pipe)
       expected: ExitSuccess
        but got: ExitFailure 1

  To rerun use: --match "/CLI Specifications/COMMON_CLI_NETWORK/CLI_NETWORK - cardano-wallet network information/"

Randomized with seed 276448537

Finished in 1568.1199 seconds, used 1779.6449 seconds of CPU time
837 examples, 1 failure, 25 pending

#2855

@rvl rvl merged commit defbc26 into master Jul 20, 2021
@rvl rvl deleted the rvl/2695/dev-env-tweaks branch July 20, 2021 04:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants