From d7d473ed167ab15de0770f0285b8b72ec2db753e Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Mon, 25 Sep 2023 14:29:19 +0100 Subject: [PATCH] Run CI against Rails release instead of main branch --- Dockerfile.ci | 2 +- docker-compose.ci.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 7f75f1a9e..0ded95afd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -9,6 +9,6 @@ WORKDIR $WORKDIR COPY . $WORKDIR -RUN RAILS_MAIN=1 bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 +RUN bundle install --jobs `expr $(cat /proc/cpuinfo | grep -c "cpu cores") - 1` --retry 3 CMD ["sh"] diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 82c48d48a..cbc842619 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -5,7 +5,6 @@ services: ci: environment: - ACTIVERECORD_UNITTEST_HOST=sqlserver - - RAILS_MAIN=1 build: context: . dockerfile: Dockerfile.ci