Skip to content

Commit 027b71c

Browse files
authored
Merge branch 'develop' into update_run_mantis_mainet_command
2 parents 0e19525 + c9e10f5 commit 027b71c

File tree

420 files changed

+21412
-9689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

420 files changed

+21412
-9689
lines changed

.buildkite/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import (import ../nix/sources.nix).nixkite

.buildkite/pipeline.nix

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{ cfg, pkgs, ... }:
2+
3+
with cfg.steps.commands;
4+
5+
let
6+
commonAttrs = {
7+
retry.automatic = true;
8+
agents.queue = "project42";
9+
};
10+
in
11+
12+
{
13+
steps.commands = {
14+
compile = commonAttrs // {
15+
label = "compile everything";
16+
command = ''
17+
nix-shell --run '$SBT compile-all'
18+
'';
19+
};
20+
21+
style = commonAttrs // {
22+
dependsOn = [ compile ];
23+
label = "scalastyle";
24+
command = ''
25+
nix-shell --run '$SBT scalastyle test:scalastyle'
26+
'';
27+
};
28+
29+
test-unit = commonAttrs // {
30+
dependsOn = [ compile ];
31+
label = "unit tests";
32+
command = ''
33+
nix-shell --run '$SBT coverage test'
34+
'';
35+
artifactPaths = [
36+
"target/test-reports/**/*"
37+
"target/scala/2.12/scoverage-report/**/*"
38+
"target/scala/2.12/coverage-report/**/*"
39+
];
40+
};
41+
42+
test-evm = commonAttrs // {
43+
dependsOn = [ compile ];
44+
label = "EVM tests";
45+
command = ''
46+
nix-shell --run '$SBT coverage evm:test'
47+
'';
48+
artifactPaths = [
49+
"target/test-reports/**/*"
50+
"target/scala/2.12/scoverage-report/**/*"
51+
"target/scala/2.12/coverage-report/**/*"
52+
];
53+
};
54+
55+
test-integration = commonAttrs // {
56+
dependsOn = [ compile ];
57+
label = "integration tests";
58+
command = ''
59+
nix-shell --run '$SBT coverageOff it:test'
60+
'';
61+
artifactPaths = [ "target/test-reports/**/*" ];
62+
};
63+
64+
test-ets = commonAttrs // {
65+
dependsOn = [ compile ];
66+
label = "ETS";
67+
command = ''
68+
nix-shell --run './test-ets.sh'
69+
'';
70+
};
71+
72+
coverageReport = commonAttrs // {
73+
dependsOn = [ test-unit test-evm ];
74+
label = "coverage report";
75+
command = ''
76+
nix-shell --run '$SBT coverageReport coverageAggregate'
77+
'';
78+
};
79+
80+
additional = commonAttrs // {
81+
dependsOn = [ compile ];
82+
label = "additional compilation & dist";
83+
command = ''
84+
nix-shell --run '$SBT benchmark:compile snappy:compile dist'
85+
'';
86+
};
87+
};
88+
}

.buildkite/pipeline.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
steps:
2+
- label: ":nix::point_right::pipeline:"
3+
command: |
4+
export NIX_PATH="nixpkgs=$(nix eval --raw '(import nix/sources.nix).nixpkgs')"
5+
nix eval --json '(import ./.buildkite { pipeline = ./.buildkite/pipeline.nix; })' \
6+
| buildkite-agent pipeline upload --no-interpolation
7+
agents:
8+
queue: project42

.buildkite/shell.nix

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{ pkgs }:
2+
3+
let
4+
5+
# TODO, share this code with mantis build in this project
6+
# sbt-protoc puts the scala plugin in /tmp/protobridge<some-random-number>.
7+
# it is in fact a shell script with a standard `#!/usr/bin/env sh` shebang
8+
# that makes the Nix sandbox ANGRY and breaks all the things in a cryptic,
9+
# hairpull-inducing way. So we gotta sed it out. Not the prettiest thing
10+
# but it works.
11+
protoc-wrapper = pkgs.writeShellScriptBin "protoc" ''
12+
set -e
13+
14+
for f in "$@"; do
15+
echo ''${f##*=}
16+
done | grep protocbridge | xargs sed -i "1s|.*|#!${pkgs.bash}/bin/bash|"
17+
18+
exec ${pkgs.protobuf}/bin/protoc "$@"
19+
'';
20+
21+
in
22+
23+
with pkgs;
24+
25+
mkShell {
26+
27+
buildInputs = [ sbt solc jdk8 protoc-wrapper ];
28+
# SBT = "sbt -v -mem 2048 -J-Xmx4g -Dsbt.ivy.home=/cache/ivy2 -Dsbt.boot.directory=/cache/sbt -Dmaven.repo.local=/cache/maven -Dnix=true";
29+
SBT = "sbt -v -mem 2048 -J-Xmx4g -Dnix=true";
30+
}

.circleci/Dockerfile

Lines changed: 0 additions & 33 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 0 additions & 101 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**To Reproduce**
11+
Steps to reproduce the behavior:
12+
1. Go to '...'
13+
2. Click on '....'
14+
3. Scroll down to '....'
15+
4. See error
16+
17+
**Expected behavior**
18+
A clear and concise description of what you expected to happen.
19+
20+
**Desktop (please complete the following information):**
21+
- OS: [e.g. Ubuntu 4.15.0-20-generic]
22+
23+
**Additional context**
24+
Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Description
2+
3+
_A clear and concise description of what this pull request does or fixes._
4+
5+
# Proposed Solution
6+
7+
8+
_**Optional** Explain how does this PR solves the problem stated in [Description](#Description). You can also enumerate different alternatives considered while approaching this task._
9+
10+
# Important Changes Introduced
11+
12+
_**Optional** Notice Reviewers about changes that were introduced while developing this task_
13+
14+
# Testing
15+
16+
_**Optional** Leave some recommendations should be useful while reviewers are testing this PR_
17+

.gitignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
.idea/
21
target/
32
dist/*
43
project/boot/
54
project/plugins/project/
65
.ensime
76
.ensime_cache/
7+
.bloop
8+
out/
9+
10+
# IDE folders
11+
.idea/
12+
.metals/
13+
metals.sbt
14+
.vscode/
815

916
# intellij scala worksheet
1017
*.sc
1118

1219
*.log
1320
*.log.zip
1421
.evm-runner_history
22+
23+
# Nix
24+
result

.scalafmt.conf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version = "2.7.1"
2+
align = none
3+
maxColumn = 120

.travis.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)