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

Default docker config #690

Merged
merged 6 commits into from Apr 4, 2019
Merged

Default docker config #690

merged 6 commits into from Apr 4, 2019

Conversation

shmish111
Copy link
Contributor

@shmish111 shmish111 commented Mar 7, 2019 •
edited

  • They need a default playground.yaml
  • we can now mount a local playground.yaml
  • fix --version flag by having nix generate a patch for Git.hs
  • fix the tutorial link on the playground; it will point to the current
    revision if built with nix and will default to point to master
    if built with cabal or stack

@shmish111
Copy link
Contributor Author

Still needs some cleaning up and Hydra stuff

@shmish111
Copy link
Contributor Author

shmish111 commented Mar 7, 2019 •
edited

Also currently only works with detached HEAD, I need to add something like

pkgs.lib.removeSuffix "\n" (builtins.readFile (./.git + "/${pkgs.lib.removeSuffix "\n" (pkgs.lib.removePrefix "ref: " (builtins.readFile ./.git/HEAD))}"))

for when you are on a branch

@shmish111
Copy link
Contributor Author

One more issue, this is not working on Hydra, I think because declInput is not being injected in the correct place, I will speak to @krisajenkins about this on Monday to try to work it out.

@shmish111
Fix the docker images
766821f 
* They need a default playground.yaml
* we can now mount a local playground.yaml
* fix --version flag by having nix generate a patch for Git.hs
* fix the tutorial link on the playground; it will point to the current
  revision if built with nix and will default to point to master
  if built with cabal or stack
@shmish111
fixes after updating to latest
4cb5de1
krisajenkins
krisajenkins approved these changes Apr 4, 2019
View reviewed changes
meadow-client/src/MainFrame.purs
, Tuple "Tutorial" "https://github.com/input-output-hk/plutus/blob/master/plutus-tutorial/tutorial/Tutorial/02-wallet-api.md"
, Tuple "API" "https://input-output-hk.github.io/plutus/"
links = [ -- Tuple "Getting Started" "https://testnet.iohkdev.io/plutus/get-started/writing-contracts-in-plutus/"
-- , Tuple "Tutorial" $ "https://github.com/input-output-hk/plutus/blob/" <> gitHead <> "/plutus-tutorial/tutorial/Tutorial/02-wallet-api.md"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These links are incorrect, I wanted them left to signify that they should be fixed. I will open an issue for this.

meadow/app/Webserver.hs
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}
{-# OPTIONS_GHC -Wno-orphans #-}
Copy link
Contributor

Choose a reason for hiding this comment

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

This right here is why I'm not a fan of stylish Haskell.

Can't change it, but it's an apt time to (re)moan.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

agreed

meadow/src/Git.hs
module Git where

gitHead :: String
gitHead = "master"
Copy link
Contributor

Choose a reason for hiding this comment

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

Yerwhat? :-D

Copy link
Contributor Author

@shmish111 shmish111 Apr 4, 2019 •
edited

Choose a reason for hiding this comment

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

I'm a monster

nix/overlays/git-module.nix

gitHead :: String
-gitHead = "master"
+gitHead = "${git-rev}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, I see. You're a monster.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

its true

@shmish111 shmish111 merged commit a7c83eb into master Apr 4, 2019
@shmish111 shmish111 mentioned this pull request Apr 4, 2019
Closed
@michaelpj
Copy link
Contributor

Can you put in some comments explaining how the git stuff works since it's not that obvious how it all fits together.

@shmish111
Copy link
Contributor Author

will do @michaelpj

@shmish111 shmish111 mentioned this pull request Apr 5, 2019
Closed
@kwxm kwxm deleted the default-docker-config branch September 10, 2019 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krisajenkins krisajenkins krisajenkins 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.

None yet
3 participants
@shmish111 @michaelpj @krisajenkins