From 8333127677ac833608ea41abd90ee0208a0edeba Mon Sep 17 00:00:00 2001
From: Jonathan Khoo <jkhoo98@gmail.com>
Date: Mon, 29 Jan 2024 00:16:40 +1300
Subject: [PATCH 1/2] Bump actions/checkout from 3 to 4 (#265)

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66d6b355..0fd34ad0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
       DATABASE_URL: "postgresql://postgres:postgres@localhost:5432"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -70,7 +70,7 @@ jobs:
   lint:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

From 406b25f4ad7ac7a42ced6987ab7e21797b83ff58 Mon Sep 17 00:00:00 2001
From: Jonathan Khoo <jkhoo98@gmail.com>
Date: Sat, 27 Apr 2024 23:54:18 +1200
Subject: [PATCH 2/2] Pin isolate to 1.10.1

This is the last version that supports cgroups v1; isolate 2.0
supports only cgroups v2.
---
 .github/workflows/ci.yml    | 2 +-
 script/install/config.bash  | 2 +-
 script/install/isolate.bash | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fd34ad0..22562e79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,7 +46,7 @@ jobs:
           SCHEDULE_BACKUPS: 0
           ISOLATE_ROOT: /
           ISOLATE_CGROUPS: false
-          ISOLATE_BRANCH: master
+          ISOLATE_BRANCH: v1.10.1
 
       - name: Back up db/schema.rb # it will be overwritten when install.bash runs migrate.bash; back up the original so we can check if it's up to date
         run: cp db/schema.rb db/schema.rb.git
diff --git a/script/install/config.bash b/script/install/config.bash
index 62d830dd..250231f4 100644
--- a/script/install/config.bash
+++ b/script/install/config.bash
@@ -203,7 +203,7 @@ declare -p ISOLATE_CGROUPS &> /dev/null || while [ -z "$ISOLATE_CGROUPS" ] ; do
   else ISOLATE_CGROUPS=false; fi
 done
 
-declare -p ISOLATE_BRANCH &> /dev/null || ISOLATE_BRANCH=master # no prompt
+declare -p ISOLATE_BRANCH &> /dev/null || ISOLATE_BRANCH=v1.10.1 # no prompt
 
 
 shopt -u nocasematch;
diff --git a/script/install/isolate.bash b/script/install/isolate.bash
index d8d3dc8c..a6ecc154 100644
--- a/script/install/isolate.bash
+++ b/script/install/isolate.bash
@@ -9,7 +9,7 @@ cd $srclocation
 if [ -d "isolate" ]; then
   cd isolate
   done=true
-  git pull --force | grep -q -v 'Already up-to-date.' && done=false
+  # git pull --force | grep -q -v 'Already up-to-date.' && done=false
   if $done; then
     exit
   fi