From 0fb429150bf7926f0dbc9774e8a532f63685acb5 Mon Sep 17 00:00:00 2001
From: Anatolios Laskaris <github_me@nahsi.dev>
Date: Tue, 2 Jul 2024 13:47:11 +0300
Subject: [PATCH] chore: Minmax instance types (#2297)

* Minmax instance types

* F

* Run tests on push
---
 .github/workflows/container.yml | 13 ++-----------
 .github/workflows/e2e.yml       |  9 ---------
 .github/workflows/release.yml   |  2 +-
 .github/workflows/run-tests.yml | 10 +++++++++-
 .github/workflows/tests.yml     |  2 +-
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 26dd584be2..adcdabddc4 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -11,15 +11,6 @@ on:
         description: "Docker image name"
         type: string
         default: "docker.fluence.dev/nox"
-      flavour:
-        # not used, here for compatibility
-        description: "nox flavour"
-        type: string
-        default: "minimal"
-      nox-sha:
-        # not used, here for compatibility
-        description: "sha256 hash of nox binary"
-        type: string
     outputs:
       nox-image:
         description: "nox snapshot image"
@@ -28,7 +19,7 @@ on:
 jobs:
   publish:
     name: "Publish snapshot"
-    runs-on: builder
+    runs-on: ubuntu-latest
     timeout-minutes: 60
 
     outputs:
@@ -109,7 +100,7 @@ jobs:
           # github allows only 10GB of cache
           # so save cache only on merge to master
           # to use less space and speed up CI
-          cache-to: ${{ github.event == 'push' && 'type=gha,mode=max' || '' }}
+          cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}
 
       - name: Print results to check summary
         if: always()
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 628e33cb31..918a9ae679 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -86,7 +86,6 @@ jobs:
     with:
       nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
 
-
   js-client:
     needs:
       - nox-snapshot
@@ -100,11 +99,3 @@ jobs:
     uses: fluencelabs/aqua/.github/workflows/tests.yml@main
     with:
       nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
-
-  # registry:
-  #   needs:
-  #     - nox-snapshot
-  #   uses: fluencelabs/registry/.github/workflows/tests.yml@main
-  #   with:
-  #     nox-image: "${{ needs.nox-snapshot.outputs.nox-image }}"
-  #     if-no-artifacts-found: warn
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 182f0f4ede..d0d5206614 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
 
   bump-version:
     if: needs.release-please.outputs.pr != null
-    runs-on: builder
+    runs-on: linux-amd64-c-2xlarge
     needs:
       - release-please
 
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 79534e016e..584b768088 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -7,6 +7,14 @@ on:
       - ".github/**"
       - "!.github/workflows/run-tests.yml"
       - "!.github/workflows/tests.yml"
+  push:
+    branches:
+      - "master"
+    paths-ignore:
+      - "**.md"
+      - ".github/**"
+      - "!.github/workflows/tests.yml"
+      - "!.github/workflows/run-tests.yml"
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
@@ -20,7 +28,7 @@ jobs:
       test-retries: 0
 
   lints:
-    runs-on: builder
+    runs-on: linux-amd64-c-2xlarge
 
     env:
       RUSTFLAGS: "-D warnings --cfg tokio_unstable -C link-arg=-B/usr/local/bin/mold"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ac450543da..05e556ff6d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ env:
 jobs:
   tests:
     name: "cargo nextest"
-    runs-on: builder
+    runs-on: linux-amd64-c-2xlarge
     timeout-minutes: 60
 
     steps: