From a905371b0cf39ab2139bc21bed02cfff1452d3bd Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 15:06:01 +0200 Subject: [PATCH 1/8] trigger ci to check if specs pass From 1b70fc097b9f717ed20f00512b40730079e9f6c4 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 15:07:22 +0200 Subject: [PATCH 2/8] trigger ci to check if specs pass From 9faadee7f2ceb4b22d1d8bd4f8d1c2227cbb562b Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 15:45:15 +0200 Subject: [PATCH 3/8] add full ruby version to avoid pull request failing --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index aa5b47c..e9c6217 100755 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Ruby 2.6 uses: actions/setup-ruby@v1 with: - ruby-version: '2.6.x' + ruby-version: '2.6.9' - uses: actions/cache@v2 with: path: vendor/bundle From bf93e94fe9bf6b9fb6d5db8e1912711fa078a73e Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 15:52:01 +0200 Subject: [PATCH 4/8] change the ruby setup git action since the action has been archived --- .github/workflows/pull_request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e9c6217..e4be327 100755 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -36,9 +36,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Ruby 2.6 - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6.9' + ruby-version: '2.6.x' - uses: actions/cache@v2 with: path: vendor/bundle From ff9fdd33c773ae4211c334f58f9a26a75e17b686 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 15:55:01 +0200 Subject: [PATCH 5/8] update pull request workflow with the exact ruby version --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e4be327..5393287 100755 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -38,7 +38,7 @@ jobs: - name: Set up Ruby 2.6 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6.x' + ruby-version: '2.6.9' - uses: actions/cache@v2 with: path: vendor/bundle From 60713d791e7683f24398ade2ddb33fa0683aa490 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 16:04:24 +0200 Subject: [PATCH 6/8] set bundler version to as workaround for using old ruby version --- .github/workflows/deploy.yml | 2 +- .github/workflows/release.yml | 2 +- Dockerfile | 4 ++-- bin/setup | 2 +- bin/update | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 40de715..18322e8 100755 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -50,7 +50,7 @@ jobs: MYSQL_PORT: ${{ job.services.mysql.ports[3306] }} run: | cp .env.build .env - gem install bundler + gem install bundler -v 2.4.22 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 sudo /etc/init.d/mysql start diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6971f8d..b4633fd 100755 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,7 +52,7 @@ jobs: MYSQL_PORT: ${{ job.services.mysql.ports[3306] }} run: | cp .env.build .env - gem install bundler + gem install bundler -v 2.4.22 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 sudo /etc/init.d/mysql start diff --git a/Dockerfile b/Dockerfile index 2af8748..cf61fc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,8 +46,8 @@ RUN mkdir -p /home/app/webapp/tmp/pids && \ # Install Ruby gems WORKDIR /home/app/webapp -RUN gem update --system && \ - gem install bundler:2.3.10 && \ +RUN gem update --system 3.4.22 && \ + gem install bundler -v 2.4.22 && \ /sbin/setuser app bundle install --path vendor/bundle # Add Runit script for shoryuken workers diff --git a/bin/setup b/bin/setup index 104e40c..f930d9c 100755 --- a/bin/setup +++ b/bin/setup @@ -15,7 +15,7 @@ chdir APP_ROOT do # Add necessary setup steps to this file. puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' + system! "gem install bundler -v 2.4.22 --conservative" system('bundle check') || system!('bundle install') diff --git a/bin/update b/bin/update index a8e4462..38337df 100755 --- a/bin/update +++ b/bin/update @@ -15,7 +15,7 @@ chdir APP_ROOT do # Add necessary update steps to this file. puts '== Installing dependencies ==' - system! 'gem install bundler --conservative' + system! "gem install bundler -v 2.4.22 --conservative" system('bundle check') || system!('bundle install') puts "\n== Updating database ==" From c33e6b6ee9e610747db3c46bea3228d79f7ddb24 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 16:09:38 +0200 Subject: [PATCH 7/8] set bundler version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0a9de7..d6c02a6 100755 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,7 +50,7 @@ jobs: MYSQL_PORT: ${{ job.services.mysql.ports[3306] }} run: | cp .env.build .env - gem install bundler + gem install bundler -v 2.4.22 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 sudo /etc/init.d/mysql start From 96f2526799c5f715b96e8cf52bde5bdcc9f9a063 Mon Sep 17 00:00:00 2001 From: Wendel Fabian Chinsamy Date: Wed, 27 Dec 2023 16:17:58 +0200 Subject: [PATCH 8/8] add bundler version --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 5393287..001f987 100755 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -50,7 +50,7 @@ jobs: MYSQL_PORT: ${{ job.services.mysql.ports[3306] }} run: | cp .env.build .env - gem install bundler + gem install bundler -v 2.4.22 bundle config path vendor/bundle bundle install --jobs 4 --retry 3 sudo /etc/init.d/mysql start