diff --git a/.github/workflows/hive-glamsterdam-devnet-6-quick.yaml b/.github/workflows/hive-glamsterdam-devnet-7-quick.yaml similarity index 93% rename from .github/workflows/hive-glamsterdam-devnet-6-quick.yaml rename to .github/workflows/hive-glamsterdam-devnet-7-quick.yaml index 88002d4..65c0640 100644 --- a/.github/workflows/hive-glamsterdam-devnet-6-quick.yaml +++ b/.github/workflows/hive-glamsterdam-devnet-7-quick.yaml @@ -1,4 +1,4 @@ -name: Hive - Glamsterdam Devnet 6 Quick +name: Hive - Glamsterdam Devnet 7 Quick on: schedule: - cron: "45 12 * * *" @@ -10,9 +10,9 @@ on: description: Comma-separated list of clients to test .e.g go-ethereum, besu, reth, nethermind, erigon, nimbus-el, ethrex simulator: type: string - # TODO: add back "ethereum/eels/consume-rlp" when clients have glamsterdam-devnet-6 branch default: >- - "ethereum/eels/consume-engine" + "ethereum/eels/consume-engine", + "ethereum/eels/consume-rlp" description: >- Comma-separated list of simulators to test .e.g ethereum/eels/consume-engine, ethereum/eels/consume-rlp @@ -34,7 +34,7 @@ on: type: string description: >- If provided, this tag will be used for all clients, overriding individual tags/branches in client_repos and client_images - default: "glamsterdam-devnet-6" + default: "glamsterdam-devnet-7" client_repos: type: string default: | @@ -109,7 +109,7 @@ jobs: with: client_repos: ${{ inputs.client_repos }} client_images: ${{ inputs.client_images }} - common_client_tag: ${{ inputs.common_client_tag || 'glamsterdam-devnet-6' }} + common_client_tag: ${{ inputs.common_client_tag || 'glamsterdam-devnet-7' }} client_source: ${{ inputs.client_source || 'git' }} hive_version: ${{ inputs.hive_version || 'ethereum/hive@master' }} goproxy: ${{ env.GOPROXY }} @@ -121,8 +121,8 @@ jobs: # BAL-specific environment variables HIVE_PARALLEL_TX_PROCESSING_DISABLED: "true" HIVE_AMSTERDAM_TIMESTAMP: "1777456800" - EELS_BUILD_ARG_FIXTURES: "https://github.com/ethereum/execution-specs/releases/download/tests-glamsterdam-devnet@v6.1.1/fixtures_glamsterdam-devnet.tar.gz" - EELS_BUILD_ARG_BRANCH: "devnets/glamsterdam/6" + EELS_BUILD_ARG_FIXTURES: "https://github.com/ethereum/execution-specs/releases/download/tests-glamsterdam-devnet@v7.0.0/fixtures_glamsterdam-devnet.tar.gz" + EELS_BUILD_ARG_BRANCH: "devnets/glamsterdam/7" runs-on: >- ${{ matrix.simulator == 'ethereum/rpc-compat' && 'ubuntu-latest' || @@ -145,10 +145,10 @@ jobs: "reth", "ethrex" '))}} - # TODO: add back "ethereum/eels/consume-rlp" when clients have glamsterdam-devnet-6 branch simulator: >- ${{ fromJSON(format('[{0}]', inputs.simulator || ' - "ethereum/eels/consume-engine" + "ethereum/eels/consume-engine", + "ethereum/eels/consume-rlp" '))}} steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/hive-glamsterdam-devnet-6.yaml b/.github/workflows/hive-glamsterdam-devnet-7.yaml similarity index 96% rename from .github/workflows/hive-glamsterdam-devnet-6.yaml rename to .github/workflows/hive-glamsterdam-devnet-7.yaml index 91a1725..254203b 100644 --- a/.github/workflows/hive-glamsterdam-devnet-6.yaml +++ b/.github/workflows/hive-glamsterdam-devnet-7.yaml @@ -1,4 +1,4 @@ -name: Hive - Glamsterdam Devnet 6 +name: Hive - Glamsterdam Devnet 7 on: schedule: - cron: "45 13 * * *" @@ -11,9 +11,9 @@ on: description: Comma-separated list of clients to test .e.g go-ethereum, besu, reth, nethermind, erigon, nimbus-el, ethrex simulator: type: string - # TODO: add back "ethereum/eels/consume-rlp" default: >- - "ethereum/eels/consume-engine" + "ethereum/eels/consume-engine", + "ethereum/eels/consume-rlp" description: >- Comma-separated list of simulators to test .e.g ethereum/rpc-compat, ethereum/eels/consume-engine, ethereum/eels/consume-rlp, ethereum/eels/execute-blobs @@ -34,7 +34,7 @@ on: type: string description: >- If provided, this tag will be used for all clients, overriding individual tags/branches in client_repos and client_images - default: "glamsterdam-devnet-6" + default: "glamsterdam-devnet-7" client_repos: type: string default: | @@ -133,7 +133,7 @@ jobs: name: "Client config: schedule" id: client_config_schedule with: - common_client_tag: "glamsterdam-devnet-6" + common_client_tag: "glamsterdam-devnet-7" client_source: "git" hive_version: "ethereum/hive@master" goproxy: ${{ env.GOPROXY }} @@ -157,8 +157,8 @@ jobs: # BAL-specific environment variables HIVE_PARALLEL_TX_PROCESSING_DISABLED: "true" HIVE_AMSTERDAM_TIMESTAMP: "1777456800" - EELS_BUILD_ARG_FIXTURES: "https://github.com/ethereum/execution-specs/releases/download/tests-glamsterdam-devnet@v6.1.1/fixtures_glamsterdam-devnet.tar.gz" - EELS_BUILD_ARG_BRANCH: "devnets/glamsterdam/6" + EELS_BUILD_ARG_FIXTURES: "https://github.com/ethereum/execution-specs/releases/download/tests-glamsterdam-devnet@v7.0.0/fixtures_glamsterdam-devnet.tar.gz" + EELS_BUILD_ARG_BRANCH: "devnets/glamsterdam/7" runs-on: >- ${{ matrix.simulator == 'ethereum/rpc-compat' && 'ubuntu-latest' ||