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

[Chore] Project build updates #660

Merged
merged 11 commits into from
Sep 14, 2020
Merged

[Chore] Project build updates #660

merged 11 commits into from
Sep 14, 2020

Conversation

mirkoAlic
Copy link
Contributor

@mirkoAlic mirkoAlic commented Sep 8, 2020

Description

As part of the catching up, the goal of this PR is to prepare the build for better supporting of the nix build.

Important Changes Introduced

  • Update Sbt
  • Update Scala
  • Remove sbt-verify package: In the near future will covered by nix build
  • Update Readme

Testing

Crucial components should continue working: CircleCi, local build, etc, etc.

@mirkoAlic mirkoAlic changed the title Chore/update sbt [Chore] Project build updates Sep 8, 2020
build.sbt Outdated
version := "2.0",
scalaVersion := "2.12.5",
version := "3.0",
scalaVersion := "2.12.10",
Copy link
Contributor

Choose a reason for hiding this comment

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

Minor: 2.12.12?

build.sbt Outdated
executableScriptName := name.value,
dist in Universal := ((dist in Universal) dependsOn verify).value
dist in Universal := (dist in Universal).value
Copy link
Contributor

Choose a reason for hiding this comment

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

this can be removed now

sbt.version = 1.2.8
Copy link
Contributor

Choose a reason for hiding this comment

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

We don't rely on anything fancy here, is 1.3 feasible then?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

let me try..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

with 1.3.13:

# Unit tests step
[info] Compiling 143 Scala sources to /home/circleci/project/target/scala-2.12/test-classes ...
/usr/share/sbt/bin/sbt-launch-lib.bash: line 58:   789 Killed                  "$@"

^ i tried to increase memory but it doesn't worked, so i decided to turn back to 1.2.8

Copy link
Contributor

@kapke kapke Sep 14, 2020

Choose a reason for hiding this comment

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

👍
Did you update your sbt launcher script as well? It has changed a bit between 1.2.x and 1.3 to accomodate for specifically different approach to memory.

- Update Sbt
- Update Scala
- Remove sbt-verify package: In the near future will covered by nix build
@mirkoAlic mirkoAlic marked this pull request as ready for review September 11, 2020 12:21
@mirkoAlic mirkoAlic added the high priority This PRs should be reviewed and merged ASAP label Sep 11, 2020
@@ -2,7 +2,7 @@ version: 2
jobs:
build:
environment:
- SBT: "sbt -v -mem 1024"
- SBT: "sbt -v -mem 2048 -J-Xmx4g -J-Xss10M"
Copy link
Contributor

Choose a reason for hiding this comment

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

setting -mem and -Xmx is redundant

@@ -1 +1 @@
-Dconfig.file=./conf/rpc-test-private.conf -Dlogback.configurationFile=./conf/rpc-test-logback.xml -J-Xss10M
-Dconfig.file=./conf/rpc-test-private.conf -Dlogback.configurationFile=./conf/rpc-test-logback.xml -J-Xmx4g -J-Xss10M
Copy link
Contributor

Choose a reason for hiding this comment

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

MAntis should be more than fine with 2g of memory with disabled mining. Do we really want to hardcode that value here and not on deployment side?

Copy link
Contributor

@kapke kapke left a comment

Choose a reason for hiding this comment

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

LGTM!

@mirkoAlic mirkoAlic merged commit 6477581 into develop Sep 14, 2020
@mirkoAlic mirkoAlic deleted the chore/update-sbt branch September 14, 2020 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement high priority This PRs should be reviewed and merged ASAP
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants