Commit bb1d159a authored by Mark Tyneway's avatar Mark Tyneway

fix: makefile

Fixes the top level makefile after bedrock contracts migration
parent c17e3d62
COMPOSEFLAGS=-d
ITESTS_L2_HOST=http://localhost:9545
build: build-go contracts integration-tests
build: build-go build-ts
.PHONY: build
build-go: submodules op-node op-proposer op-batcher
.PHONY: build-go
build-ts: submodules contracts integration-tests
build-ts: submodules
yarn build
.PHONY: build-ts
submodules:
......@@ -42,14 +43,6 @@ mod-tidy:
cd ./op-e2e && go mod tidy && cd ..
.PHONY: mod-tidy
contracts:
cd ./contracts-bedrock && yarn install && yarn build
.PHONY: contracts
integration-tests:
cd ./packages/integration-tests-bedrock && yarn install && yarn build:contracts
.PHONY: integration-tests
clean:
rm -rf ./bin
.PHONY: clean
......@@ -63,7 +56,7 @@ devnet-down:
.PHONY: devnet-down
devnet-clean:
rm -rf ./contracts-bedrock/deployments/devnetL1
rm -rf ./packages/contracts-bedrock/deployments/devnetL1
rm -rf ./.devnet
cd ./ops-bedrock && docker-compose down
docker volume rm ops-bedrock_l1_data
......@@ -76,12 +69,12 @@ test-unit:
make -C ./op-proposer test
make -C ./op-batcher test
make -C ./op-e2e test
cd ./contracts-bedrock && yarn test
yarn test
.PHONY: test-unit
test-integration:
bash ./ops-bedrock/test-integration.sh \
./contracts-bedrock/deployments/devnetL1
./packages/contracts-bedrock/deployments/devnetL1
.PHONY: test-integration
devnet-genesis:
......
......@@ -7,7 +7,7 @@
"lint": "yarn lint:fix && yarn lint:check",
"lint:fix": "yarn lint:check --fix",
"lint:check": "eslint . --max-warnings=0",
"build:contracts": "forge build --root . -c contracts -o artifacts",
"build": "forge build --root . -c contracts -o artifacts",
"test": "echo 'no unit tests'",
"test:actor": "IS_LIVE_NETWORK=true ts-node actor-tests/lib/runner.ts",
"test:integration:live": "NO_NETWORK=true IS_LIVE_NETWORK=true hardhat --network optimism test",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment