From 325dfe5a229a14370bfb6ab05f41796e3e016a69 Mon Sep 17 00:00:00 2001
From: Groovie | Mango <95291500+grooviegermanikus@users.noreply.github.com>
Date: Wed, 11 Dec 2024 13:04:21 +0100
Subject: [PATCH] remove nightly clippy+fmt config (#419)

---
 .github/workflows/clippy_test.yml            | 8 +++-----
 .github/workflows/fly-deploy-benchrunner.yml | 2 +-
 .github/workflows/fly-deploy-staging.yml     | 2 +-
 .github/workflows/fly-deploy.yml             | 2 +-
 run_clippy_fmt.sh                            | 4 ++--
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/clippy_test.yml b/.github/workflows/clippy_test.yml
index 1c2727d5..336a3c27 100644
--- a/.github/workflows/clippy_test.yml
+++ b/.github/workflows/clippy_test.yml
@@ -1,4 +1,4 @@
-name: Cargo Nightly Clippy
+name: Cargo clippy+fmt
 
 on:
   push:
@@ -27,8 +27,6 @@ jobs:
       # The toolchain action should definitely be run before the cache action
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          # use toolchain version from rust-toolchain.toml
-          toolchain: nightly
           components: rustfmt, clippy
           cache: true
           # avoid the default "-D warnings" which thrashes cache
@@ -48,5 +46,5 @@ jobs:
 
       - name: Run fmt+clippy
         run: |
-          cargo +nightly fmt --all --check
-          cargo +nightly clippy --locked --workspace --all-targets -- -D warnings
+          cargo fmt --all --check
+          cargo clippy --locked --workspace --all-targets -- -D warnings
diff --git a/.github/workflows/fly-deploy-benchrunner.yml b/.github/workflows/fly-deploy-benchrunner.yml
index f5b0cce1..b0814593 100644
--- a/.github/workflows/fly-deploy-benchrunner.yml
+++ b/.github/workflows/fly-deploy-benchrunner.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 
         uses: actions/checkout@v2
diff --git a/.github/workflows/fly-deploy-staging.yml b/.github/workflows/fly-deploy-staging.yml
index 3cb9111f..6187acbf 100644
--- a/.github/workflows/fly-deploy-staging.yml
+++ b/.github/workflows/fly-deploy-staging.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 
         uses: actions/checkout@v2
diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml
index 0496b034..0ad72d33 100644
--- a/.github/workflows/fly-deploy.yml
+++ b/.github/workflows/fly-deploy.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 
         uses: actions/checkout@v2
diff --git a/run_clippy_fmt.sh b/run_clippy_fmt.sh
index 2a037cc3..265d4f84 100755
--- a/run_clippy_fmt.sh
+++ b/run_clippy_fmt.sh
@@ -1,2 +1,2 @@
-cargo +nightly fmt --all
-cargo +nightly clippy --locked --workspace --all-targets -- -D warnings
\ No newline at end of file
+cargo fmt --all
+cargo clippy --locked --workspace --all-targets -- -D warnings
\ No newline at end of file