Skip to content

Commit

Permalink
Merge branch 'arith-dev' into feat/issue-917/reconnect-ram
Browse files Browse the repository at this point in the history
  • Loading branch information
letypequividelespoubelles authored Oct 9, 2024
2 parents 039aeb9 + 9c23a86 commit 558fc9f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 24 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/gradle-ethereum-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
ethereum-tests:
runs-on: [self-hosted, Linux, X64, xxlarge]
runs-on: ubuntu-latest-128
steps:
- uses: webfactory/[email protected]
with:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:


ethereum-tests-go-corset:
runs-on: [self-hosted, Linux, X64, xxlarge]
runs-on: ubuntu-latest-128
steps:
- uses: webfactory/[email protected]
with:
Expand Down Expand Up @@ -88,8 +88,6 @@ jobs:

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Install Go Corset
run: go install github.com/consensys/go-corset/cmd/go-corset@latest
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/gradle-nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
nightly-tests:
runs-on: [self-hosted, Linux, X64, xxlarge]
runs-on: ubuntu-latest-128
steps:
- uses: webfactory/[email protected]
with:
Expand All @@ -35,8 +35,6 @@ jobs:

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Install Go Corset
run:
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/gradle-weekly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:

jobs:
tests:
runs-on: [self-hosted, Linux, X64, medium]
runs-on: ubuntu-latest
steps:
- uses: webfactory/[email protected]
with:
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
path: build/reports/tests/**/*

go-corset-tests:
runs-on: [self-hosted, Linux, X64, medium]
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: webfactory/[email protected]
Expand All @@ -75,8 +75,6 @@ jobs:

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Install Go Corset
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]
jobs:
validation:
name: "Validation"
runs-on: [self-hosted, Linux, X64, small]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1
10 changes: 3 additions & 7 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ env:

jobs:
build:
runs-on: [self-hosted, Linux, X64, large]
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Set up GCC
uses: egor-tensin/setup-gcc@v1
Expand Down Expand Up @@ -54,7 +52,7 @@ jobs:

tests:
needs: [ build ]
runs-on: [self-hosted, Linux, X64, large]
runs-on: ubuntu-latest-32
steps:
- name: Setup upterm session
if: ${{ inputs.tests-with-ssh }}
Expand Down Expand Up @@ -107,7 +105,7 @@ jobs:

go-corset-tests:
needs: [ build ]
runs-on: [self-hosted, Linux, X64, large]
runs-on: ubuntu-latest-32
continue-on-error: true
steps:
- name: Setup upterm session
Expand Down Expand Up @@ -140,8 +138,6 @@ jobs:

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Install Go Corset
run:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/reference-blockchain-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
blockchain-reference-tests:
runs-on: [self-hosted, Linux, X64, xxlarge]
runs-on: [ubuntu-latest-128]
steps:
- uses: webfactory/[email protected]
with:
Expand Down Expand Up @@ -50,8 +50,6 @@ jobs:

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.23.1

- name: Install Go Corset
run: go install github.com/consensys/go-corset/cmd/go-corset@latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
runs-on: [self-hosted, Linux, X64, medium]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
publish:
needs: build
if: github.event_name != 'pull_request'
runs-on: [self-hosted, Linux, X64, medium]
runs-on: ubuntu-latest
env:
architecture: "amd64"
GRADLE_OPTS: "-Xmx6g -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=4"
Expand Down

0 comments on commit 558fc9f

Please sign in to comment.