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.

Sign up for GitHub

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

Buildkite CI #2217

Merged
merged 6 commits into from
Mar 3, 2020
Merged

Buildkite CI #2217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a79334
adjust script to be used in buildkite ci
ailisp Feb 29, 2020
df5ecbd
wip codecov, need to build newer cmake from source
ailisp Mar 2, 2020
03a0946
remove gitlab-ci
ailisp Mar 2, 2020
26f20a2
wip update kcov for cov
ailisp Mar 2, 2020
3f9c9d2
Merge branch 'master' into buildkite
ailisp Mar 2, 2020
6cea893
trigger a build after branch limiting
ailisp Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions .gitlab-ci.yml
View file
Open in desktop

This file was deleted.

20 changes: 8 additions & 12 deletions scripts/near-kcov-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:19.04 as builder
FROM amazonlinux:2 as builder

RUN apt-get update -qq && apt-get install -y \
git cmake build-essential ninja-build binutils-dev libcurl4-openssl-dev zlib1g-dev libdw-dev libiberty-dev python3 \
&& rm -rf /var/lib/apt/lists/*
RUN yum update -y && yum install -y \
openssl-devel.x86_64 elfutils-libelf-devel libcurl-devel binutils-devel elfutils-devel zlib-devel git cmake3 ninja-build python3 \
&& yum clean all && rm -rf /var/cache/yum

RUN git clone https://github.com/SimonKagstrom/kcov.git

Expand All @@ -14,17 +14,13 @@ RUN mkdir build && \
cmake --build . && \
cmake --build . --target install

FROM ubuntu:19.04
FROM amazonlinux:2

COPY --from=builder /usr/local/bin/kcov* /usr/local/bin/
COPY --from=builder /usr/local/share/doc/kcov /usr/local/share/doc/kcov

RUN apt-get update -qq && apt-get install -y \
libssl-dev \
binutils-dev \
libcurl4 \
libdw1 \
zlib1g \
&& rm -rf /var/lib/apt/lists/*
RUN yum update -y && yum install -y \
openssl-devel.x86_64 elfutils-libelf-devel libcurl-devel binutils-devel elfutils-devel zlib-devel \
&& yum clean all && rm -rf /var/cache/yum

CMD ["/usr/local/bin/kcov"]
8 changes: 4 additions & 4 deletions scripts/near-test-runtime.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:19.04
FROM amazonlinux:2

RUN apt-get update -qq && apt-get install -y \
libssl-dev \
&& rm -rf /var/lib/apt/lists/*
RUN yum update -y && yum install -y \
openssl-devel.x86_64 \
&& yum clean all && rm -rf /var/cache/yum
4 changes: 2 additions & 2 deletions scripts/parallel_coverage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def coverage(test_binary):
'-v', f'{test_binary}:{test_binary}',
'-v', f'{src_dir}:{src_dir}',
'-v', f'{coverage_output}:{coverage_output}',
'ailisp/near-coverage-runtime',
'bash', '-c', f'chmod +x {test_binary} && /usr/local/bin/kcov --include-pattern=nearcore --exclude-pattern=.so --verify {coverage_output} {test_binary}'],
'nearprotocol/near-coverage-runtime',
'bash', '-c', f'/usr/local/bin/kcov --include-pattern=nearcore --exclude-pattern=.so --verify {coverage_output} {test_binary}'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
stdout, stderr = p.communicate()
return (p.returncode, stdout, stderr)
Expand Down
4 changes: 2 additions & 2 deletions scripts/test_nearlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trap 'pkill -15 -P $NEAR_PID' 0

#./scripts/build_wasm.sh

function get_nearlib_nearshell_release () {
function get_nearlib_nearshell_release {
rm -rf nearlib_release_test near-shell nearlib
mkdir nearlib_release_test
cd nearlib_release_test
Expand All @@ -20,7 +20,7 @@ function get_nearlib_nearshell_release () {
cd ..
}

function get_nearlib_nearshell_git () {
function get_nearlib_nearshell_git {
rm -rf nearlib
git clone https://github.com/nearprotocol/nearlib.git nearlib
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/testlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def run_test(test_binary, isolate=True):
cmd = ['docker', 'run', '--rm',
'-u', f'{os.getuid()}:{os.getgid()}',
'-v', f'{test_binary}:{test_binary}',
'ailisp/near-test-runtime',
'bash', '-c', f'chmod +x {test_binary} && RUST_BACKTRACE=1 {test_binary}']
'nearprotocol/near-test-runtime',
'bash', '-c', f'RUST_BACKTRACE=1 {test_binary}']
else:
cmd = [test_binary]
print(f'========= run test {test_binary}')
Expand Down