From 41921f328fccf3e7c64fca9b4da4219512b8ecd6 Mon Sep 17 00:00:00 2001
From: Diego <diego@celestia.org>
Date: Tue, 19 Nov 2024 11:52:36 -0500
Subject: [PATCH] Revert "use ubuntu-8"

This reverts commit 6973c775132602239b3cf11653f967bc448a2707.
---
 .github/workflows/arbitrator-ci.yml   | 17 ++++++++---------
 .github/workflows/ci.yml              |  2 +-
 .github/workflows/codeql-analysis.yml |  2 +-
 .github/workflows/docker.yml          |  2 +-
 .github/workflows/release-ci.yml      |  2 +-
 .github/workflows/shellcheck-ci.yml   |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
index 95340f1353..7ca1836683 100644
--- a/.github/workflows/arbitrator-ci.yml
+++ b/.github/workflows/arbitrator-ci.yml
@@ -22,13 +22,16 @@ on:
 
 env:
   RUST_BACKTRACE: 1
-  # RUSTFLAGS: -Dwarnings            # TODO: re-enable after wasmer upgrade
+  RUSTFLAGS: -Dwarnings # TODO: re-enable after wasmer upgrade
   WABT_VERSION: 1.0.32
 
 jobs:
   arbitrator:
     name: Run Arbitrator tests
-    runs-on: ubuntu-8
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
     steps:
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
@@ -143,13 +146,9 @@ jobs:
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
         uses: mymindstorm/setup-emsdk@v12
         with:
-          # Make sure to set a version number!
           version: 3.1.6
-          # This is the name of the cache folder.
-          # The cache folder will be placed in the build directory,
-          #  so make sure it doesn't conflict with anything!
-          actions-cache-folder: "emsdk-cache"
-          no-cache: true
+          actions-cache-folder: "emsdk-cache-${{ github.run_id }}"
+          no-cache: false
 
       - name: Build cbrotli-wasm
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
@@ -159,7 +158,7 @@ jobs:
         run: echo "$HOME/wabt-prefix/bin" >> "$GITHUB_PATH"
 
       - name: Make arbitrator libraries
-        run: make -j wasm-ci-build
+        run: RUSTFLAGS="-A warnings" make -j wasm-ci-build
 
       - name: Clippy check
         run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f91f153786..e4d1daabf2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   test:
     name: Go Tests
-    runs-on: ubuntu-8
+    runs-on: ubuntu-latest
 
     # Creates a redis container for redis tests
     services:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 717e59515d..170e300ecf 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
   analyze:
     name: Analyze
     if: github.repository == 'OffchainLabs/nitro' # don't run in any forks without "Advanced Security" enabled
-    runs-on: ubuntu-8
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2aacf32f00..ba6239b050 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,7 +13,7 @@ on:
 jobs:
   docker:
     name: Docker build
-    runs-on: ubuntu-8
+    runs-on: ubuntu-latest
     services:
       # local registery
       registry:
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
index 017f28b734..b7156cd303 100644
--- a/.github/workflows/release-ci.yml
+++ b/.github/workflows/release-ci.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build_and_run:
-    runs-on: ubuntu-8
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/shellcheck-ci.yml b/.github/workflows/shellcheck-ci.yml
index d1c7b58580..987c528e2d 100644
--- a/.github/workflows/shellcheck-ci.yml
+++ b/.github/workflows/shellcheck-ci.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   shellcheck:
     name: Run ShellCheck
-    runs-on: ubuntu-8
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4