Skip to content
This repository has been archived by the owner on Aug 18, 2020. It is now read-only.

[TSD-116] Bump report server on master #3716

Merged
merged 5 commits into from
Oct 8, 2018

Conversation

ksaric
Copy link
Contributor

@ksaric ksaric commented Oct 5, 2018

Description

I'm just trying to add #3394 to develop.

Linked issue

Part of https://iohk.myjetbrains.com/youtrack/issue/TSD-116

Type of change

  • 🐞 Bug fix (non-breaking change which fixes an issue)
  • 🛠 New feature (non-breaking change which adds functionality)
  • ⚠️ Breaking change (fix or feature that would cause existing functionality to change)
  • 🏭 Refactoring that does not change existing functionality but does improve things like code readability, structure etc
  • 🔨 New or improved tests for existing code
  • ⛑ git-flow chore (backport, hotfix, etc)

Developer checklist

  • I have read the style guide document, and my code follows the code style of this project.
  • If my code deals with exceptions, it follows the guidelines.
  • I have updated any documentation accordingly, if needed. Documentation changes can be reflected in opening a PR on cardanodocs.com, amending the inline Haddock comments, any relevant README file or one of the document listed in the docs directory.
  • CHANGELOG entry has been added and is linked to the correct PR on GitHub.

Testing checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.

QA Steps

Screenshots (if available)

@ksaric ksaric requested a review from deepfire October 5, 2018 12:35
Copy link
Contributor

@deepfire deepfire left a comment

Choose a reason for hiding this comment

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

The Nix bump part looks good -- incl. the hash.

@ksaric
Copy link
Contributor Author

ksaric commented Oct 5, 2018

All tests pass locally, AppVeyor timeouts, and I have no clue what's the deal with those two scripts but it doesn't look related to the changes.

@deepfire
Copy link
Contributor

deepfire commented Oct 8, 2018

Only Appveyor remains, and it either times out, or fails with:`

[62 of 68] Compiling Pos.Wallet.Web.Server.Handlers ( src\Pos\Wallet\Web\Server\Handlers.hs, .w\dist\5c8418a7\build\Pos\Wallet\Web\Server\Handlers.o )
    ghc.EXE: getMBlocks: VirtualAlloc MEM_COMMIT failed: The paging file is too small for this operation to complete.

@deepfire deepfire merged commit 6085e87 into develop Oct 8, 2018
@deepfire deepfire deleted the ksaric/bump-report-server-masterD branch October 8, 2018 14:21
@ksaric
Copy link
Contributor Author

ksaric commented Oct 8, 2018

Thanks for fixing CI and merging, @deepfire 👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants