From ca08fc7831197db0f661ab1ace8da563b03c6707 Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@GMAIL.com>
Date: Wed, 16 Dec 2020 23:29:07 +0000
Subject: [PATCH] Revert "add caching to test suite (#2089)" (#2098)

## Issue Addressed

N/A

## Proposed Changes

I didn't realize the `PORTABLE` env variable is only picked up by `install` in the `Makefile` so we are still getting `SIGILL`s:

https://github.com/sigp/lighthouse/runs/1565004525?check_suite_focus=true

## Additional Info



Co-authored-by: realbigsean <seananderson33@gmail.com>
---
 .github/workflows/docker.yml     | 13 --------
 .github/workflows/test-suite.yml | 55 +-------------------------------
 2 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e5fce06bd..bc57238cf 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -28,19 +28,6 @@ jobs:
             DOCKER_CLI_EXPERIMENTAL: enabled
         steps:
             - uses: actions/checkout@v2
-            - name: Cache cargo directory
-              uses: actions/cache@v2
-              with:
-                  path: |
-                      ~/.cargo/registry/index/
-                      ~/.cargo/registry/cache/
-                      ~/.cargo/git/db/
-                  key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-            - name: Cache target aarch64 release directory
-              uses: actions/cache@v2
-              with:
-                  path: target/aarch64-unknown-linux-gnu/release
-                  key: ${{ runner.os }}-target-aarch64-release-portable-${{ hashFiles('**/Cargo.lock') }}
             - name: Dockerhub login
               run: |
                   echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 1862f97f1..35dc8471a 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -3,7 +3,7 @@ name: test-suite
 on:
   push:
     branches:
-      - unstable
+      - master
       - staging
       - trying
       - 'pr/*'
@@ -11,7 +11,6 @@ on:
 env:
   # Deny warnings in CI
   RUSTFLAGS: "-D warnings"
-  PORTABLE: true
 jobs:
   cargo-fmt:
     name: cargo-fmt
@@ -28,19 +27,6 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
-    - name: Cache cargo directory
-      uses: actions/cache@v2
-      with:
-          path: |
-              ~/.cargo/registry/index/
-              ~/.cargo/registry/cache/
-              ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - name: Cache target release directory
-      uses: actions/cache@v2
-      with:
-          path: target/release
-          key: ${{ runner.os }}-target-release-portable-${{ hashFiles('**/Cargo.lock') }}
     - name: Get latest version of stable Rust
       run: rustup update stable
     - name: Install ganache-cli
@@ -53,19 +39,6 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
-    - name: Cache cargo directory
-      uses: actions/cache@v2
-      with:
-          path: |
-              ~/.cargo/registry/index/
-              ~/.cargo/registry/cache/
-              ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - name: Cache target debug directory
-      uses: actions/cache@v2
-      with:
-          path: target/debug
-          key: ${{ runner.os }}-target-debug-portable-${{ hashFiles('**/Cargo.lock') }}
     - name: Get latest version of stable Rust
       run: rustup update stable
     - name: Install ganache-cli
@@ -106,19 +79,6 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
-    - name: Cache cargo directory
-      uses: actions/cache@v2
-      with:
-          path: |
-              ~/.cargo/registry/index/
-              ~/.cargo/registry/cache/
-              ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - name: Cache target release directory
-      uses: actions/cache@v2
-      with:
-          path: target/release
-          key: ${{ runner.os }}-target-release-portable-${{ hashFiles('**/Cargo.lock') }}
     - name: Install ganache-cli
       run: sudo npm install -g ganache-cli
     - name: Run the beacon chain sim that starts from an eth1 contract
@@ -129,19 +89,6 @@ jobs:
     needs: cargo-fmt
     steps:
     - uses: actions/checkout@v1
-    - name: Cache cargo directory
-      uses: actions/cache@v2
-      with:
-          path: |
-              ~/.cargo/registry/index/
-              ~/.cargo/registry/cache/
-              ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-    - name: Cache target release directory
-      uses: actions/cache@v2
-      with:
-          path: target/release
-          key: ${{ runner.os }}-target-release-portable-${{ hashFiles('**/Cargo.lock') }}
     - name: Install ganache-cli
       run: sudo npm install -g ganache-cli
     - name: Run the beacon chain sim without an eth1 connection