Merge recent fixes #25
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lock, and delete key methods
`#ifdef` checks for defined-ness, one cannot use it with another
`<710` argument.
Newer GHCs point that out:
src/Network/Consul/Types.hs:30:0: error:
warning: extra tokens at end of #ifdef directive
#ifdef __GLASGOW_HASKELL__ <710
^
See added comment.
Fixes test suite failure:
testRunServiceTtl: FAIL (15.01s)
tests/Main.hs:323:
testRunServiceTtl: Check not passing
that creates consul log messsage:
[ERR] http: Request GET /v1/agent/check/pass/service:testRunServiceTtl, error: method GET not allowed
Instead, bring up an own instance of consul, and run against that. Fixes test suite deleting production data when built and tested on a production machine.
This was referenced Jan 18, 2020
nh2
force-pushed
the
nh2fixes
branch
2 times, most recently
from
55ef410 to
adba2eb
Compare
From https://github.com/commercialhaskell/stack/blob/c3c33b61a4d5c286a6718550d285305270ba4bf0/doc/travis-complex.yml Drops GHC * 8.0.1 * 7.10.3 adding instead * 8.0.2 * 8.2.2 * 8.4.4 * 8.6.5
|
CI is green now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With #23 I can help maintaining this library.
This PR merges contributed PRs brought into working order, including:
It also fixes tests (#23) and makes the switch from
monad-controlto the more modern an easier-to-useunliftio.