Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Consensys/linea-monorepo into trace…
Browse files Browse the repository at this point in the history
…s-v2-config-test
  • Loading branch information
Filter94 committed Oct 14, 2024
2 parents 452d1dc + cd443d9 commit a28ef25
Show file tree
Hide file tree
Showing 64 changed files with 935 additions and 1,103 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/all-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
changes:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Filter commit changes
outputs:
all-tools: ${{ steps.filter.outputs['all-tools'] }}
Expand All @@ -39,7 +39,7 @@ jobs:
uses: ./.github/workflows/reuse-store-image-name-and-tags.yml

check_image_tags_exist:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Check image tags exist
needs: [ changes, store_image_name_and_tags ]
if: ${{ needs.changes.outputs['all-tools'] == 'false' }}
Expand All @@ -56,7 +56,7 @@ jobs:
docker_password: ${{ secrets.DOCKERHUB_TOKEN }}

all-tools-tag-only:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: All tools tag only
needs: [ changes, store_image_name_and_tags, check_image_tags_exist ]
if: ${{ github.event_name != 'pull_request' && needs.changes.outputs['all-tools'] == 'false' }}
Expand All @@ -83,7 +83,7 @@ jobs:
build-and-publish:
needs: [ changes, store_image_name_and_tags, all-tools-tag-only ]
if: ${{ always() && (needs.changes.outputs['all-tools'] == 'true' || needs.all-tools-tag-only.result != 'success' || needs.all-tools-tag-only.outputs.image_tagged != 'true') }}
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
env:
COMMIT_TAG: ${{ needs.store_image_name_and_tags.outputs.commit_tag }}
DEVELOP_TAG: ${{ needs.store_image_name_and_tags.outputs.develop_tag }}
Expand All @@ -97,7 +97,7 @@ jobs:
submodules: true
persist-credentials: false
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bridge-ui-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
run-e2e-tests:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bridge-ui-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
publish:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
steps:
- name: Checkout
Expand All @@ -31,13 +31,13 @@ jobs:
run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-bridge-ui-${{ steps.package-version.outputs.current-version }}" | tee $GITHUB_ENV

- name: Login to Docker Repository
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Docker Image Build and Publish
id: docker-build-publish
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cache-docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
changes:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Filter commit changes
outputs:
cache-images: ${{ steps.filter.outputs.cache-images }}
Expand All @@ -31,12 +31,12 @@ jobs:
pull-and-cache-images:
needs: [ changes ]
if: ${{ always() && needs.changes.outputs.cache-images == 'true' }}
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, medium]
permissions:
actions: read
contents: read
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/coordinator-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ on:

concurrency:
group: coordinator-build-and-publish-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
build-and-publish:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Coordinator build
environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
env:
Expand All @@ -54,17 +54,17 @@ jobs:
- name: Build dist
run: |
./gradlew coordinator:app:distZip --no-daemon
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
- name: Docker meta
id: coordinator
uses: docker/metadata-action@v3
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/coordinator-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

concurrency:
group: coordinator-testing-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
cache-docker-images:
Expand Down Expand Up @@ -51,6 +51,11 @@ jobs:
- name: Build coordinator and Unit tests
run: |
./gradlew -V coordinator:app:buildNeeded
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Run integration tests
run: |
./gradlew integrationTest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/finalized-tag-updater-github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
release:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/load-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ concurrency:

jobs:
run-load-test:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Run Load Test
steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
uses: ./.github/workflows/reuse-store-image-name-and-tags.yml

filter-commit-changes:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Filter commit changes
outputs:
coordinator: ${{ steps.filter.outputs.coordinator }}
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
if: ${{ always() && needs.docker-build.result == 'success' }}
concurrency:
group: run-e2e-tests-geth-tracing-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
uses: ./.github/workflows/reuse-run-e2e-tests.yml
with:
commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
Expand All @@ -168,7 +168,7 @@ jobs:
if: ${{ always() && needs.docker-build.result == 'success' }}
concurrency:
group: run-e2e-tests-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
uses: ./.github/workflows/reuse-run-e2e-tests.yml
with:
commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
Expand All @@ -191,7 +191,7 @@ jobs:
cleanup-deployments:
needs: [ run-e2e-tests, run-e2e-tests-geth-tracing ]
if: ${{ always() }}
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- uses: strumwolf/delete-deployment-environment@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:

jobs:
release:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/postman-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ on:

concurrency:
group: postman-build-and-publish-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
build-and-publish:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Postman build
environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
env:
Expand All @@ -49,16 +49,16 @@ jobs:
submodules: true
persist-credentials: false
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: 'arm64,arm'
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Show the "version" build argument
run: |
echo "We inject the commit tag in the docker image ${{ env.COMMIT_TAG }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postman-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ on:

concurrency:
group: postman-testing-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
run-tests:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-22.04, X64, large]
name: Postman & SDK tests
steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/prover-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ on:

concurrency:
group: prover-build-and-publish-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
GOPROXY: "https://proxy.golang.org"

jobs:
build-and-publish:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Prover build
environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
env:
Expand All @@ -52,12 +52,12 @@ jobs:
submodules: true
persist-credentials: false
- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Show the "version" build argument
run: |
echo "We inject the commit tag in the docker image ${{ env.COMMIT_TAG }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:

build-linux:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
path: ./prover/target

build-linux-arm64:
runs-on: besu-arm64
runs-on: [self-hosted, ubuntu-20.04, ARM64, small]
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
release_artefacts:
name: Release artefacts
needs: [ build-linux, build-linux-arm64, build-mac-os]
runs-on: [self-hosted,ubuntu-22.04ARM64, small]
runs-on: [self-hosted, ubuntu-20.04, ARM64, small]
steps:
- name: Load cached binaries
uses: actions/download-artifact@v4
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/prover-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ env:

concurrency:
group: prover-testing-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
staticcheck:
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
name: Prover static check
steps:
- name: install Go
Expand All @@ -44,6 +44,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.61.0
working-directory: prover
args: --timeout=5m
- name: generated files should not be modified
Expand All @@ -58,7 +59,7 @@ jobs:
strategy:
matrix:
go-version: [1.23.x]
runs-on: [self-hosted, ubuntu-22.04, X64, medium]
runs-on: [self-hosted, ubuntu-22.04, X64, large]
name: Prover testing
needs:
- staticcheck
Expand Down Expand Up @@ -99,7 +100,7 @@ jobs:
needs:
- staticcheck
- test
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Notify slack -- workflow failed
id: slack
Expand All @@ -122,7 +123,7 @@ jobs:
needs:
- staticcheck
- test
runs-on: [self-hosted, ubuntu-22.04, X64, small]
runs-on: [self-hosted, ubuntu-20.04, X64, small]
steps:
- name: Notify slack -- workflow succeeded
id: slack
Expand Down
Loading

0 comments on commit a28ef25

Please sign in to comment.