Skip to content

Commit

Permalink
Merge branch 'merge-ictt' into remove-tesnet-flows
Browse files Browse the repository at this point in the history
  • Loading branch information
geoff-vball committed Oct 31, 2024
2 parents b060ae3 + 7a218a1 commit ab90f68
Show file tree
Hide file tree
Showing 55 changed files with 2,317 additions and 721 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/abi_bindings_checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ jobs:
- name: Install Foundry
run: ./scripts/install_foundry.sh

- name: Install solc
run: |
source ./scripts/versions.sh
wget https://github.com/ethereum/solidity/releases/download/v$SOLIDITY_VERSION/solc-static-linux
chmod +x solc-static-linux
sudo mv solc-static-linux /usr/local/bin/solc
- name: Generate ABI Go bindings
run: |
export PATH=$PATH:$HOME/.foundry/bin
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
branches:
- "**"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
solidity-unit-tests:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -116,3 +120,27 @@ jobs:
export PATH=$PATH:$HOME/.foundry/bin
export PATH="$PATH:$GOPATH/bin"
./scripts/e2e_test.sh --components validator-manager
ictt_e2e:
name: ictt-e2e-tests
runs-on: ubuntu-22.04
steps:
- name: Checkout repositories and submodules
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'

- name: Install Foundry
run: ./scripts/install_foundry.sh

- name: Run E2E Tests
# Forge installs to BASE_DIR, but updates the PATH definition in $HOME/.bashrc
run: |
export PATH=$PATH:$HOME/.foundry/bin
export PATH="$PATH:$GOPATH/bin"
./scripts/e2e_test.sh --components ictt
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
branch = v1
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "lib/openzeppelin-contracts"]
path = lib/openzeppelin-contracts
url = https://github.com/openzeppelin/openzeppelin-contracts
[submodule "lib/openzeppelin-contracts-upgradeable"]
path = lib/openzeppelin-contracts-upgradeable
url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
Expand Down
2 changes: 1 addition & 1 deletion abi-bindings/go/INativeMinter/INativeMinter.go

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

4 changes: 2 additions & 2 deletions abi-bindings/go/ProxyAdmin/ProxyAdmin.go

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

Loading

0 comments on commit ab90f68

Please sign in to comment.