Merge branch 'master' into compiled-evaluators

NZOI · May 15, 2024 · 93f3ceb · 93f3ceb
2 parents bdde018 + 9600bdc
commit 93f3ceb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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

diff --git 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
@@ -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