Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Removes usage of make #119

Merged
merged 3 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions integration-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ services:
- "8080:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -52,6 +54,8 @@ services:
- "8081:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -81,6 +85,8 @@ services:
- primev_net
ports:
- "8082:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -112,6 +118,8 @@ services:
- "8083:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -141,6 +149,8 @@ services:
- primev_net
ports:
- "8084:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -172,6 +182,8 @@ services:
- "8085:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -201,6 +213,8 @@ services:
- primev_net
ports:
- "8086:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -232,6 +246,8 @@ services:
- "8087:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -263,6 +279,8 @@ services:
- primev_net
ports:
- "8088:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -294,6 +312,8 @@ services:
- "8089:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -325,6 +345,8 @@ services:
- primev_net
ports:
- "8090:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -356,6 +378,8 @@ services:
- "8091:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -387,6 +411,8 @@ services:
- primev_net
ports:
- "8092:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -418,6 +444,8 @@ services:
- "8093:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -449,6 +477,8 @@ services:
- primev_net
ports:
- "8094:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -480,6 +510,8 @@ services:
- "8095:13523"
env_file:
- integrationtest/.env
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand Down Expand Up @@ -511,6 +543,8 @@ services:
- primev_net
ports:
- "8096:8080"
profiles:
- non-datadog
labels:
com.datadoghq.ad.check_names: '["openmetrics"]'
com.datadoghq.ad.init_configs: '[{}]'
Expand All @@ -532,6 +566,8 @@ services:
- integrationtest/.env
networks:
- primev_net
profiles:
- non-datadog

datadog-agent:
image: gcr.io/datadoghq/agent:latest
Expand Down
15 changes: 7 additions & 8 deletions mev-commit-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ create_primev_dir() {
clone_repos() {
echo "Cloning repositories under $PRIMEV_DIR..."
# Clone only if the directory doesn't exist
[ ! -d "$GETH_POA_PATH" ] && git clone https://github.com/primevprotocol/go-ethereum.git "$GETH_POA_PATH"
[ ! -d "$CONTRACTS_PATH" ] && git clone https://github.com/primevprotocol/contracts.git "$CONTRACTS_PATH"
[ ! -d "$MEV_COMMIT_PATH" ] && git clone https://github.com/primevprotocol/mev-commit.git "$MEV_COMMIT_PATH"
[ ! -d "$GETH_POA_PATH" ] && git clone git@github.com:primevprotocol/go-ethereum.git "$GETH_POA_PATH"
[ ! -d "$CONTRACTS_PATH" ] && git clone git@github.com:primevprotocol/contracts.git "$CONTRACTS_PATH"
[ ! -d "$MEV_COMMIT_PATH" ] && git clone git@github.com:primevprotocol/mev-commit.git "$MEV_COMMIT_PATH"
}

# Function to pull latest changes for all repositories
Expand All @@ -53,7 +53,7 @@ update_repos() {
start_settlement_layer() {
local datadog_key=$1

git clone https://github.com/primevprotocol/go-ethereum.git "$GETH_POA_PATH"
git clone git@github.com:primevprotocol/go-ethereum.git "$GETH_POA_PATH"
echo "Starting Settlement Layer..."

cat > "$GETH_POA_PATH/geth-poa/.env" <<EOF
Expand All @@ -65,13 +65,12 @@ NEXT_PUBLIC_WALLET_CONNECT_ID=
DD_KEY=${datadog_key}
EOF

make -C "$GETH_POA_PATH"/geth-poa up-prod-settlement
}

start_mev_commit() {
start_mev_commit() {
local datadog_key=$1
echo "Starting MEV-Commit..."
DD_KEY="$datadog_key" docker compose -f "$MEV_COMMIT_PATH/integration-compose.yml" up --build -d
DD_KEY="$datadog_key" docker compose --profile non-datadog -f "$MEV_COMMIT_PATH/integration-compose.yml" up --build -d
}

deploy_contracts() {
Expand Down Expand Up @@ -176,7 +175,7 @@ case "$1" in
cleanup
;;
*)
echo "Usage: $0 {start|update|cleanup|sl} [rpc-url] [datadog-key]"
echo "Usage: $0 {start|update|cleanup} [rpc-url] [datadog-key]"
exit 1
esac

Expand Down