Skip to content

Commit

Permalink
Merge branch 'develop' into preprocess-curl-operations
Browse files Browse the repository at this point in the history
  • Loading branch information
bkase authored Aug 26, 2020
2 parents 6ce2e8c + b096d2c commit 3b3110d
Show file tree
Hide file tree
Showing 112 changed files with 2,255 additions and 9,784 deletions.
90 changes: 41 additions & 49 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,46 @@ jobs:
- run:
name: Compare test signatures for consensus, nonconsensus code
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/compare_test_signatures.sh'
client-sdk-unit-tests:
docker:
- image: codaprotocol/coda:toolchain-9924f4c56a40d65d36440e8f70b93720f29ba171
steps:

- run:
name: Disable LFS checkout
command: |
git config --global filter.lfs.smudge "git-lfs smudge --skip %f"
git config --global lfs.fetchexclude "*"
- checkout


- run:
name: Update Submodules
command: git submodule sync && git submodule update --init --recursive
- run:
name: Create opam cache signature file including a year/date stamp to ensure occasional rebuilds
command: |
cat scripts/setup-opam.sh > opam_ci_cache.sig
cat src/opam.export >> opam_ci_cache.sig
date +%Y-%m >> opam_ci_cache.sig
- restore_cache:
name: Restore cache - opam
keys:
- opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
- run:
name: Install opam dependencies - opam -- make setup-opam
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'make setup-opam'

- run:
name: Build client SDK, run unit tests
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/client-sdk-unit-tests.sh'
- run:
name: Yarn deps
command: cd frontend/client_sdk && yarn install
- run:
name: Prepublish client SDK packages
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && cd frontend/client_sdk && yarn prepublishOnly'

update-branch-protection:
docker:
- image: python:3
Expand Down Expand Up @@ -511,54 +551,6 @@ jobs:
command: ./scripts/skip_if_only_frontend_or_rfcs.sh scripts/artifacts.sh
- store_artifacts:
path: package

build-client-sdk:
resource_class: large
docker:
- image: codaprotocol/coda:toolchain-9924f4c56a40d65d36440e8f70b93720f29ba171
steps:

- run:
name: Disable LFS checkout
command: |
git config --global filter.lfs.smudge "git-lfs smudge --skip %f"
git config --global lfs.fetchexclude "*"
- checkout

- run:
name: Artifacts Path
command: |
mkdir -p /tmp/artifacts
- run:
name: Update Submodules
command: git submodule sync && git submodule update --init --recursive
- run:
name: Create opam cache signature file including a year/date stamp to ensure occasional rebuilds
command: |
cat scripts/setup-opam.sh > opam_ci_cache.sig
cat src/opam.export >> opam_ci_cache.sig
date +%Y-%m >> opam_ci_cache.sig
- restore_cache:
name: Restore cache - opam
keys:
- opam-linux-v1-{{ checksum "opam_ci_cache.sig" }}
- run:
name: Install opam dependencies - opam -- make setup-opam
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'make setup-opam'

- run:
name: Build client SDK for Javascript
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && make client_sdk 2>&1 | tee /tmp/artifacts/buildclientsdk.log'
environment:
DUNE_PROFILE: nonconsensus_medium_curves
no_output_timeout: 10m
- run:
name: Yarn deps
command: cd frontend/client_sdk && yarn install
- run:
name: Build And Test Client SDK
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && cd frontend/client_sdk && yarn prepublishOnly'
build-artifacts--testnet_postake_medium_curves:
resource_class: xlarge
docker:
Expand Down Expand Up @@ -1467,6 +1459,7 @@ workflows:
- lint
- lint-opt
- compare-test-signatures
- client-sdk-unit-tests
- update-branch-protection:
filters:
branches:
Expand All @@ -1476,7 +1469,6 @@ workflows:
- test-archive
- build-archive
- build-macos
- build-client-sdk
- build-artifacts--testnet_postake_medium_curves
- build-artifacts-docker--testnet_postake_medium_curves--coda-daemon:
requires:
Expand Down
42 changes: 17 additions & 25 deletions .circleci/config.yml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,22 @@ jobs:
- run:
name: Compare test signatures for consensus, nonconsensus code
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/compare_test_signatures.sh'
client-sdk-unit-tests:
docker:
- image: codaprotocol/coda:toolchain-9924f4c56a40d65d36440e8f70b93720f29ba171
steps:
{{ checkout_no_lfs }}
{{ opam_init_linux }}
- run:
name: Build client SDK, run unit tests
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'eval `opam config env` && export PATH="$HOME/.cargo/bin:$PATH" && ./scripts/client-sdk-unit-tests.sh'
- run:
name: Yarn deps
command: cd frontend/client_sdk && yarn install
- run:
name: Prepublish client SDK packages
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && cd frontend/client_sdk && yarn prepublishOnly'

update-branch-protection:
docker:
- image: python:3
Expand Down Expand Up @@ -388,30 +404,6 @@ jobs:
- store_artifacts:
path: package

build-client-sdk:
resource_class: large
docker:
- image: codaprotocol/coda:toolchain-9924f4c56a40d65d36440e8f70b93720f29ba171
steps:
{{ checkout_no_lfs }}
- run:
name: Artifacts Path
command: |
mkdir -p /tmp/artifacts
{{ opam_init_linux }}
- run:
name: Build client SDK for Javascript
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && make client_sdk 2>&1 | tee /tmp/artifacts/buildclientsdk.log'
environment:
DUNE_PROFILE: nonconsensus_medium_curves
no_output_timeout: 10m
- run:
name: Yarn deps
command: cd frontend/client_sdk && yarn install
- run:
name: Build And Test Client SDK
command: ./scripts/skip_if_only_frontend_or_rfcs.sh bash -c 'set -o pipefail; eval `opam config env` && cd frontend/client_sdk && yarn prepublishOnly'

{%- for profile in build_artifact_profiles %}
build-artifacts--{{profile}}:
resource_class: xlarge
Expand Down Expand Up @@ -704,6 +696,7 @@ workflows:
- lint
- lint-opt
- compare-test-signatures
- client-sdk-unit-tests
- update-branch-protection:
filters:
branches:
Expand All @@ -713,7 +706,6 @@ workflows:
- test-archive
- build-archive
- build-macos
- build-client-sdk
{%- for profile in build_artifact_profiles %}
- build-artifacts--{{profile}}
{%- endfor %}
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ pull_request_rules:
- name: automatically merge approved PRs with the ready-to-merge label
conditions:
- "status-success=ci/circleci: build-artifacts--testnet_postake_medium_curves"
- "status-success=ci/circleci: build-client-sdk"
- "status-success=ci/circleci: build-wallet"
- "status-success=ci/circleci: client-sdk-unit-tests"
- "status-success=ci/circleci: compare-test-signatures"
- "status-success=ci/circleci: lint"
- "status-success=ci/circleci: test--dev--coda-batch-payment-test"
Expand All @@ -26,8 +26,8 @@ pull_request_rules:
- name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label
conditions:
- "status-success=ci/circleci: build-artifacts--testnet_postake_medium_curves"
- "status-success=ci/circleci: build-client-sdk"
- "status-success=ci/circleci: build-wallet"
- "status-success=ci/circleci: client-sdk-unit-tests"
- "status-success=ci/circleci: compare-test-signatures"
- "status-success=ci/circleci: lint"
- "status-success=ci/circleci: test--dev--coda-batch-payment-test"
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@ client_sdk_test_sigs_nonconsensus :
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/client_sdk/tests/test_signatures_nonconsensus.exe --profile=nonconsensus_medium_curves
$(info Build complete)

rosetta_lib_encodings :
$(info Starting Build)
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/lib/rosetta_lib/test/test_encodings.exe --profile=testnet_postake_medium_curves
$(info Build complete)

rosetta_lib_encodings_nonconsensus :
$(info Starting Build)
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/nonconsensus/rosetta_lib/test/test_encodings.exe --profile=nonconsensus_medium_curves
$(info Build complete)

dhall_types :
$(info Starting Build)
ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/dhall_types/dump_dhall_types.exe --profile=dev
Expand Down
17 changes: 0 additions & 17 deletions buildkite/scripts/build-client-sdk.sh

This file was deleted.

17 changes: 17 additions & 0 deletions buildkite/scripts/client-sdk-tool.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/bin/bash

set -eo pipefail

if [[ $# -ne 1 ]]; then
echo "Usage: $0 '<yarn-args>'"
exit 1
fi

yarn_args="${1}"

echo "--- Client SDK execute: ${yarn_args}"
eval `opam config env` && \
pushd frontend/client_sdk && \
yarn install && \
yarn ${yarn_args} && \
popd
4 changes: 2 additions & 2 deletions buildkite/scripts/setup-database-for-archive-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ user=$1
password=$2
db=$3

sudo apt-get install -y postgresql
sudo apt-get update -y && sudo apt-get install -y postgresql
sudo service postgresql start
sudo -u postgres psql -c "CREATE USER ${user} WITH SUPERUSER PASSWORD '${password}';"
sudo -u postgres createdb -O $user $db
sudo -u postgres createdb -O $user $db
42 changes: 32 additions & 10 deletions buildkite/src/Jobs/ClientSdk.dhall
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
let Prelude = ../External/Prelude.dhall
let S = ../Lib/SelectFiles.dhall

let S = ../Lib/SelectFiles.dhall
let Cmd = ../Lib/Cmds.dhall

let Pipeline = ../Pipeline/Dsl.dhall
let JobSpec = ../Pipeline/JobSpec.dhall

let Command = ../Command/Base.dhall
let OpamInit = ../Command/OpamInit.dhall
let Docker = ../Command/Docker/Type.dhall
let Size = ../Command/Size.dhall
let JobSpec = ../Pipeline/JobSpec.dhall

in

Expand All @@ -23,14 +24,35 @@ Pipeline.build
name = "ClientSdk"
},
steps = [
Command.build
Command.Config::{
commands = OpamInit.andThenRunInDocker ([] : List Text) "./buildkite/scripts/build-client-sdk.sh",
label = "Build client-sdk",
key = "build-client-sdk",
target = Size.Medium,
docker = None Docker.Type
}
Command.build
Command.Config::{
commands = [
Cmd.run "chmod -R 777 frontend/client_sdk",
Cmd.runInDocker
Cmd.Docker::{image = (../Constants/ContainerImages.dhall).codaToolchain}
"cd frontend/client_sdk && yarn install"
]
, label = "Install Yarn dependencies"
, key = "install-yarn-deps"
, target = Size.Small
, docker = None Docker.Type
},
Command.build
Command.Config::{
commands = OpamInit.andThenRunInDocker ([] : List Text) "./scripts/client-sdk-unit-tests.sh"
, label = "Build client SDK, run unit tests"
, key = "client-sdk-build-unittests"
, target = Size.Medium
, docker = None Docker.Type
},
Command.build
Command.Config::{
commands = OpamInit.andThenRunInDocker ([] : List Text) "./buildkite/scripts/client-sdk-tool.sh 'prepublishOnly'"
, label = "Prepublish client SDK packages"
, key = "prepublish-client-sdk"
, target = Size.Medium
, docker = None Docker.Type
}
]
}

1 change: 0 additions & 1 deletion frontend/website-redesign/pages/developers.js

This file was deleted.

1 change: 0 additions & 1 deletion frontend/website-redesign/pages/genesis.js

This file was deleted.

1 change: 0 additions & 1 deletion frontend/website-redesign/pages/leaderboard.js

This file was deleted.

1 change: 0 additions & 1 deletion frontend/website-redesign/pages/memberProfile.js

This file was deleted.

Loading

0 comments on commit 3b3110d

Please sign in to comment.