From 670ae9e34eb28a18cb984dd5aca7275548967e20 Mon Sep 17 00:00:00 2001
From: sveitser <sveitser@gmail.com>
Date: Fri, 16 Aug 2024 15:46:56 +0200
Subject: [PATCH] Use public github runner

- Remove docker caching that would only work on persitent runner
---
 .github/workflows/ci.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a78e451c..5cd6e0f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,14 +6,15 @@ on:
     merge_group:
     pull_request:
     push:
-      branches:
-        - master
-        - develop
-  
+
+# Cancel in-progress jobs except for integration branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains(github.ref, 'integration/')}}
 
 jobs:
   build_and_run:
-    runs-on: ubuntu-8
+    runs-on: ubuntu-24.04
 
     steps:
     - name: Checkout
@@ -26,12 +27,5 @@ jobs:
       with:
         driver-opts: network=host
 
-    - name: Cache Docker layers
-      uses: actions/cache@v3
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}
-        restore-keys: ${{ runner.os }}-buildx-
-          
     - name:  Startup Nitro testnode
       run: ${{ github.workspace }}/.github/workflows/testnode.bash