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

Commit

Permalink
Merge branch 'extension-into-branch' of https://github.com/privacy-sc…
Browse files Browse the repository at this point in the history
…aling-explorations/zkevm-circuits into extension-into-branch
  • Loading branch information
miha-stopar committed Apr 18, 2024
2 parents d325bf5 + cba233e commit 7e2c7c3
Show file tree
Hide file tree
Showing 269 changed files with 14,663 additions and 4,183 deletions.
2 changes: 1 addition & 1 deletion .github/testoolScripts/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runner_vpc_id="vpc-05dedcb650bd24f8d"
# Get runner status
runner=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[testool] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)

echo "Reports: http://testool-public.s3-website.eu-central-1.amazonaws.com"
echo "Reports: https://testool.pse.dev"
echo "Shuting down instance..."
aws ec2 stop-instances --profile $profile --instance-ids $runner

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/geth-utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: Format
uses: Jerome1337/[email protected]
Expand Down
14 changes: 2 additions & 12 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,9 @@ jobs:
with:
override: false
- name: Setup golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ~1.19
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,10 @@ jobs:
with:
components: rustfmt, clippy
override: false
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
- name: Setup golang
uses: actions/setup-go@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: lint-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down
42 changes: 8 additions & 34 deletions .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,9 @@ jobs:
with:
override: false
- name: Setup golang
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: ~1.19
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand All @@ -79,7 +69,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks
args: --verbose --release --all --all-features --exclude integration-tests --exclude circuit-benchmarks -- --test-threads 24
- name: Run testool internal tests
uses: actions-rs/cargo@v1
with:
Expand All @@ -104,19 +94,9 @@ jobs:
with:
override: false
- name: Setup golang
uses: actions/setup-go@v3
with:
go-version: ~1.19
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
uses: actions/setup-go@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -155,16 +135,10 @@ jobs:
override: false
- name: Add target
run: rustup target add x86_64-unknown-linux-gnu
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
- name: Setup golang
uses: actions/setup-go@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/test-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,10 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
override: false

# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
- name: Setup golang
uses: actions/setup-go@v4
with:
path: |
~/.cache/go-build
~/go/pkg/mod
key: ${{ github.workflow }}-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

go-version: ~1.21
- name: Cargo cache
uses: actions/cache@v3
with:
Expand Down
Loading

0 comments on commit 7e2c7c3

Please sign in to comment.