From 4a90ddd1c64478a99d582314530599a8e43f0b1f Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Mon, 5 Aug 2024 02:10:55 -0400 Subject: [PATCH 1/2] fix: CI Environment --- .github/workflows/arbitrator-ci.yml | 2 +- .github/workflows/arbitrator-skip-ci.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker-eigenda.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/release-ci.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index 0424e72ca..470316c9b 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -28,7 +28,7 @@ env: jobs: arbitrator: name: Run Arbitrator tests - runs-on: linux-2xl + runs-on: linux-xl steps: - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml index 3e8e2e3fa..a9ba879d3 100644 --- a/.github/workflows/arbitrator-skip-ci.yml +++ b/.github/workflows/arbitrator-skip-ci.yml @@ -15,7 +15,7 @@ on: jobs: arbitrator: name: Run Arbitrator tests - runs-on: linux-2xl + runs-on: linux-xl steps: - name: Do nothing run: echo "doing nothing" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2931fa956..7b3a0ad98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: jobs: test: name: Go Tests - runs-on: linux-2xl + runs-on: linux-xl # Creates a redis container for redis tests services: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d35b77ee3..b5d236636 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,7 +26,7 @@ jobs: analyze: name: Analyze if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled - runs-on: linux-2xl + runs-on: linux-xl permissions: actions: read contents: read diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 00d1b99be..8ecf623ed 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -5,7 +5,7 @@ on: jobs: docker: - runs-on: linux-2xl + runs-on: linux-xl strategy: matrix: include: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a01d288be..5178d95a2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ on: jobs: docker: name: Docker build - runs-on: linux-2xl + runs-on: linux-xl services: # local registery registry: diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 46da3664c..1b76c3f5f 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -6,7 +6,7 @@ on: jobs: build_and_run: - runs-on: linux-2xl + runs-on: linux-xl steps: - name: Checkout From fb316e84d6175ff55c839547f0ef26f097b0f8c3 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Mon, 5 Aug 2024 15:53:17 -0400 Subject: [PATCH 2/2] fix: CI Environment - revert runner & use different toolchain --- .github/workflows/arbitrator-ci.yml | 2 +- .github/workflows/arbitrator-skip-ci.yml | 2 +- .github/workflows/ci.yml | 12 +++++++----- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker-eigenda.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/release-ci.yml | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml index 470316c9b..0424e72ca 100644 --- a/.github/workflows/arbitrator-ci.yml +++ b/.github/workflows/arbitrator-ci.yml @@ -28,7 +28,7 @@ env: jobs: arbitrator: name: Run Arbitrator tests - runs-on: linux-xl + runs-on: linux-2xl steps: - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml index a9ba879d3..3e8e2e3fa 100644 --- a/.github/workflows/arbitrator-skip-ci.yml +++ b/.github/workflows/arbitrator-skip-ci.yml @@ -15,7 +15,7 @@ on: jobs: arbitrator: name: Run Arbitrator tests - runs-on: linux-xl + runs-on: linux-2xl steps: - name: Do nothing run: echo "doing nothing" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b3a0ad98..b0ebd8852 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ on: jobs: test: name: Go Tests - runs-on: linux-xl + runs-on: linux-2xl # Creates a redis container for redis tests services: @@ -67,15 +67,17 @@ jobs: id: install-rust-nightly with: profile: minimal - toolchain: "nightly" - + toolchain: "nightly-2024-07-30" + - name: Install rust wasm targets run: rustup target add wasm32-wasi wasm32-unknown-unknown - name: Install nightly wasm targets run: | - rustup component add rust-src --toolchain nightly - rustup target add wasm32-unknown-unknown --toolchain nightly + nightly_toolchain='nightly-2024-07-30' + echo 'STYLUS_NIGHTLY_VER=+'"$nightly_toolchain" >> "$GITHUB_ENV" + rustup component add rust-src --toolchain "$nightly_toolchain" + rustup target add wasm32-unknown-unknown --toolchain "$nightly_toolchain" - name: Cache Build Products uses: actions/cache@v3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b5d236636..d35b77ee3 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,7 +26,7 @@ jobs: analyze: name: Analyze if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled - runs-on: linux-xl + runs-on: linux-2xl permissions: actions: read contents: read diff --git a/.github/workflows/docker-eigenda.yml b/.github/workflows/docker-eigenda.yml index 8ecf623ed..00d1b99be 100644 --- a/.github/workflows/docker-eigenda.yml +++ b/.github/workflows/docker-eigenda.yml @@ -5,7 +5,7 @@ on: jobs: docker: - runs-on: linux-xl + runs-on: linux-2xl strategy: matrix: include: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5178d95a2..a01d288be 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -13,7 +13,7 @@ on: jobs: docker: name: Docker build - runs-on: linux-xl + runs-on: linux-2xl services: # local registery registry: diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 1b76c3f5f..46da3664c 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -6,7 +6,7 @@ on: jobs: build_and_run: - runs-on: linux-xl + runs-on: linux-2xl steps: - name: Checkout