From 750aac10fe4484fcf58e94b0858ac2b3163c584c Mon Sep 17 00:00:00 2001
From: Gautam Botrel <gautam.botrel@gmail.com>
Date: Thu, 12 Oct 2023 15:16:59 -0500
Subject: [PATCH] ci: new attempt to fix push to master workflow

---
 .github/workflows/push.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index dd04e2c0f3..c5cd9b3768 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -56,14 +56,12 @@ jobs:
       uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go-version }}
-
-
     - name: install deps
       run: |
         go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest
         go install github.com/ethereum/go-ethereum/cmd/abigen@v1.12.0
     - name: install solc deps
-      if: (${{ matrix.os }} != 'windows-latest') && (${{ matrix.os }} != 'macos-latest')
+      if: startsWith(matrix.os, 'ubuntu') == true
       run: |
         go install github.com/consensys/gnark-solidity-checker@latest
         sudo add-apt-repository ppa:ethereum/ethereum
@@ -77,14 +75,14 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
     - name: Test (windows / mac)
       # on macOS CI / Windows CI we avoid running the std/ tests (they are run on ubuntu CI)
-      if: (${{ matrix.os }} == 'windows-latest') || (${{ matrix.os }} == 'macos-latest')
+      if: startsWith(matrix.os, 'ubuntu') == false
       run: |
         go test -tags=release_checks -v -timeout=60m .
         go test -tags=release_checks -v -timeout=60m ./frontend/...
         go test -tags=release_checks -v -timeout=60m ./backend/...
         go test -short -v -timeout=60m ./...
     - name: Test (ubuntu - race and solc)
-      if: (${{ matrix.os }} != 'windows-latest') && (${{ matrix.os }} != 'macos-latest')
+      if: startsWith(matrix.os, 'ubuntu') == true
       run: |
         go test -json -v -timeout=60m -tags=release_checks ./... 2>&1 | gotestfmt -hide=all | tee /tmp/gotest.log
         go test -json -v -tags=release_checks,solccheck . 2>&1 | gotestfmt -hide=all | tee -a /tmp/gotest.log
@@ -92,7 +90,7 @@ jobs:
 
     - name: Generate job summary
       id: generate-job-summary
-      if: (${{ matrix.os }} != 'windows-latest') && (${{ matrix.os }} != 'macos-latest') && ${{ always() }}
+      if: startsWith(matrix.os, 'ubuntu') == true && always()
       run: |
         if [ -s /tmp/gotest.log ]; then
           cat /tmp/gotest.log > $GITHUB_STEP_SUMMARY