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.

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

Fix v1 needs common #643

Merged
merged 1 commit into from
Jan 26, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: fetch ef tests
run: make setup
- name: fetch Kakarot
run: make setup-kakarot-v0 && make setup-kakarot-v1
run: make setup-kakarot
env:
GITHUB_TOKEN: ${{ github.token }}
- name: run tests v0
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ $(EF_TESTS_DIR):
.PHONY: $(EF_TESTS_DIR) build
setup: $(EF_TESTS_DIR)

setup-kakarot-v0: clean-kakarot-v0
setup-kakarot-v0: clean-common clean-kakarot-v0
@curl -sL -o kakarot-build.zip -H "Authorization: token $(GITHUB_TOKEN)" "$(KKRT_V0_BUILD_ARTIFACT_URL)"
unzip -o kakarot-build.zip -d build/v0
mv build/v0/fixtures/ERC20.json build/common/
rm -f kakarot-build.zip

setup-kakarot-v1: clean-kakarot-v1
setup-kakarot-v1: clean-common clean-kakarot-v1
@curl -sL -o dev-artifacts.zip -H "Authorization: token $(GITHUB_TOKEN)" "$(KKRT_V1_BUILD_ARTIFACT_URL)"
unzip -o dev-artifacts.zip -d build/temp
mv build/temp/contracts_ContractAccount.compiled_contract_class.json build/v1/contract_account.json
Expand All @@ -47,12 +47,15 @@ setup-kakarot-v1: clean-kakarot-v1
rm -fr build/temp
rm -f dev-artifacts.zip

setup-kakarot: setup-kakarot-v0 setup-kakarot-v1

clean-common:
rm -rf build/common
mkdir -p build/common

clean-kakarot-v0:
rm -rf build/v0
rm -rf build/common
mkdir -p build/v0
mkdir -p build/common

clean-kakarot-v1:
rm -rf build/v1
Expand Down
Loading