remove macOS runner (#396)

OpenZeppelin · Jan 2, 2025 · eff6ebd · eff6ebd
1 parent 43508d9
commit eff6ebd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 61 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -13,13 +13,6 @@ on:
       - "evm-template/**"
       - "**.md"
       - "**.adoc"
-  workflow_dispatch:
-    inputs:
-      test-macos:
-        description: "run tests on macOS"
-        required: true
-        default: false
-        type: boolean
 
 # If new code is pushed to a PR branch, then cancel in progress workflows for
 # that PR. Ensures that we don't waste CI time, and returns results quicker.
@@ -42,19 +35,7 @@ env:
 
 jobs:
   clippy-fmt-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-22.04
-          - macos-12
-        run-all:
-          - ${{ inputs.test-macos == true || github.ref == 'refs/heads/main' }}
-        exclude: # exclude macos-12 when the condition is false
-          - run-all: false
-            os: macos-12
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./
@@ -74,7 +55,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           components: clippy, rustfmt
-      
+
       - name: "Install cargo-llvm-cov"
         uses: taiki-e/install-action@v2
         with:

diff --git a/.github/workflows/evm.yml b/.github/workflows/evm.yml
@@ -13,13 +13,6 @@ on:
       - "generic-template/**"
       - "**.md"
       - "**.adoc"
-  workflow_dispatch:
-    inputs:
-      test-macos:
-        description: "run tests on macOS"
-        required: true
-        default: false
-        type: boolean
 
 # If new code is pushed to a PR branch, then cancel in progress workflows for
 # that PR. Ensures that we don't waste CI time, and returns results quicker.
@@ -42,19 +35,7 @@ env:
 
 jobs:
   evm-clippy-fmt-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-22.04
-          - macos-12
-        run-all:
-          - ${{ inputs.test-macos == true || github.ref == 'refs/heads/main' }}
-        exclude: # exclude macos-12 when the condition is false
-          - run-all: false
-            os: macos-12
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./evm-template

diff --git a/.github/workflows/generic.yml b/.github/workflows/generic.yml
@@ -13,13 +13,6 @@ on:
       - "evm-template/**"
       - "**.md"
       - "**.adoc"
-  workflow_dispatch:
-    inputs:
-      test-macos:
-        description: "run tests on macOS"
-        required: true
-        default: false
-        type: boolean
 
 # If new code is pushed to a PR branch, then cancel in progress workflows for
 # that PR. Ensures that we don't waste CI time, and returns results quicker.
@@ -42,22 +35,11 @@ env:
 
 jobs:
   clippy-fmt-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-22.04
-          - macos-12
-        run-all:
-          - ${{ inputs.test-macos == true || github.ref == 'refs/heads/main' }}
-        exclude: # exclude macos-12 when the condition is false
-          - run-all: false
-            os: macos-12
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./generic-template
+
     steps:
       - name: git checkout
         uses: actions/checkout@v4