From ee2a8aa1100a0a2b6a0d3150b0bdb4007e654f04 Mon Sep 17 00:00:00 2001
From: mattstam <mattstam@live.com>
Date: Wed, 1 May 2024 11:59:54 -0700
Subject: [PATCH] setup go on all machines 2

---
 .github/workflows/release.yml | 54 ++++-------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bc3d552d7e..500b23195b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,53 +15,6 @@ env:
   IS_NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
 
 jobs:
-  setup-environment:
-    name: Setup Environment ${{ matrix.target }} (${{ matrix.runner }})
-    runs-on: ${{ matrix.runner }}
-    timeout-minutes: 240
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # `runner`: GHA runner label
-          # `target`: Rust build target triple
-          # `platform` and `arch`: Used in tarball names
-          # `svm`: target platform to use for the Solc binary: https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24
-          - runner: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            svm_target_platform: linux-amd64
-            platform: linux
-            arch: amd64
-          - runner: warp-ubuntu-latest-arm64-4x
-            target: aarch64-unknown-linux-gnu
-            svm_target_platform: linux-aarch64
-            platform: linux
-            arch: arm64
-          - runner: macos-latest-large
-            target: x86_64-apple-darwin
-            svm_target_platform: macosx-amd64
-            platform: darwin
-            arch: amd64
-          - runner: macos-latest-xlarge
-            target: aarch64-apple-darwin
-            svm_target_platform: macosx-aarch64
-            platform: darwin
-            arch: arm64
-          # - runner: windows-latest
-          #   target: x86_64-pc-windows-msvc
-          #   svm_target_platform: windows-amd64
-          #   platform: win32
-          #   arch: amd64
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup CI
-        uses: ./.github/actions/setup
-        with:
-          pull_token: ${{ secrets.PULL_TOKEN }}
-
   prepare:
     name: Prepare release
     runs-on: ubuntu-latest
@@ -114,7 +67,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release:
-    name: ${{ matrix.target }} (${{ matrix.runner }})
+    name: Release ${{ matrix.target }} (${{ matrix.runner }})
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 240
     needs: prepare
@@ -154,6 +107,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup Environment
+        uses: ./.github/actions/setup
+        with:
+          pull_token: ${{ secrets.PULL_TOKEN }}
+
       - name: Install nightly toolchain
         id: rustc-toolchain
         uses: actions-rs/toolchain@v1