Skip to content

Commit

Permalink
fix: the SC submodule and deps (#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
hedgar2017 authored Sep 14, 2024
1 parent 67b672f commit 56877cf
Show file tree
Hide file tree
Showing 13 changed files with 449 additions and 369 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,8 @@ jobs:
target-machine:
runs-on: ubuntu-latest
outputs:
evm: ${{ steps.evm.outputs.machine }}
eravm: ${{ steps.eravm.outputs.machine }}
default: ${{ steps.default.outputs.machine }}
evm: ${{ steps.evm.outputs.machine || steps.default.outputs.evm }}
eravm: ${{ steps.eravm.outputs.machine || steps.default.outputs.eravm }}
steps:

- name: Check for EraVM target
Expand All @@ -86,7 +85,8 @@ jobs:
shell: bash -ex {0}
run: |
if [[ "${{ join(steps.*.outputs.*) }}" == "" ]]; then
echo "machine=default" | tee -a "${GITHUB_OUTPUT}"
echo "eravm=eravm" | tee -a "${GITHUB_OUTPUT}"
echo "evm=evm" | tee -a "${GITHUB_OUTPUT}"
fi
# Integration tests workflow call from the era-compiler-ci repository
Expand All @@ -110,7 +110,7 @@ jobs:
# If you would like to make a change to the benchmarks workflow, please do it in the era-compiler-ci repository
benchmarks:
needs: target-machine
uses: matter-labs/era-compiler-ci/.github/workflows/benchmarks.yml@v1
uses: matter-labs/era-compiler-ci/.github/workflows/benchmarks.yml@aba-fix-benchmarks-json
secrets: inherit
strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
branch = develop
[submodule "era-contracts"]
path = era-contracts
url = https://github.com/matter-labs/era-contracts
branch = evm-equivalence-yul
url = https://github.com/lambdaclass/era-contracts
branch = evm-equivalence-yul-new
119 changes: 63 additions & 56 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 56877cf

Please sign in to comment.