Skip to content

Conversation

@kapke
Copy link
Contributor

@kapke kapke commented Sep 30, 2020

Description

Fix compilation issues with updated web3j, make Circle compile all targets.

@kapke kapke requested review from lemastero and mmrozek September 30, 2020 07:41
@kapke kapke self-assigned this Sep 30, 2020
Copy link
Contributor

@mmrozek mmrozek left a comment

Choose a reason for hiding this comment

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

The changes from .circleci/config should be reflected in buildkite config

@mirkoAlic
Copy link
Contributor

mirkoAlic commented Sep 30, 2020

The changes from .circleci/config should be reflected in buildkite config

if you are referring to compile-all step, that is already there: https://github.com/input-output-hk/mantis/pull/707/files#diff-4bc7af90a8380d7ed64283e70a4d7f2dR15

@mirkoAlic mirkoAlic changed the title [Chore] Fix compilation issues with updated web3j, make Circle compil… [Chore] Fix compilation issues with updated web3j Sep 30, 2020
Copy link
Contributor

@mirkoAlic mirkoAlic left a comment

Choose a reason for hiding this comment

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

With latest pull from develop, you should re-generate nix dependencies, given the web3j version was downgraded, and this PR is assuming a newer one. (Also, circle ci file is no longer needed)

name: additional compilation & dist
# this step builds parts of the codebase which are not tested in CI
# so as to prevent compilation regression
command: $SBT benchmark:compile snappy:compile dist
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we could keep dist step?

Copy link
Contributor

Choose a reason for hiding this comment

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

Is already included for buildkite pipeline: https://github.com/input-output-hk/mantis/pull/707/files#diff-4bc7af90a8380d7ed64283e70a4d7f2dR84
or you mean having it as a separate step?

mirkoAlic and others added 3 commits October 1, 2020 10:16
…nto chore-update-web3j

Conflicts:
	- .circleci/config.yml
	+ "org.web3j" % "core" % "5.0.0"

TODO: Apply nix-expr.patch from buildkite run!
Copy link
Contributor

@mirkoAlic mirkoAlic left a comment

Choose a reason for hiding this comment

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

💯

@mirkoAlic mirkoAlic merged commit f421f79 into develop Oct 1, 2020
@mirkoAlic mirkoAlic deleted the chore-update-web3j branch October 1, 2020 14:23
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.

5 participants