Skip to content

Commit

Permalink
update CircleCI config, therubyracer -> mini_racer, bump Rails version
Browse files Browse the repository at this point in the history
  • Loading branch information
nimdraugsael committed May 30, 2023
1 parent 29666b2 commit bee9335
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 24 deletions.
23 changes: 2 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,12 @@ version: 2
jobs:
build:
docker:
- image: debian:stretch
- image: cimg/ruby:3.2.2
# use CircleCI convenience image with pre-installed docker/docker-compose

steps:
- checkout

# This should go into custom primary image, here's only for the sake of explanation
- run:
name: Install Docker client
command: |
set -x
VER="17.03.0-ce"
apt-get update && apt-get install curl -y
curl -L -o /tmp/docker-$VER.tgz https://get.docker.com/builds/Linux/x86_64/docker-$VER.tgz
tar -xz -C /tmp -f /tmp/docker-$VER.tgz
mv /tmp/docker/* /usr/bin
# This should go into custom primary image, here's only for the sake of explanation
- run:
name: Install Docker Compose
command: |
set -x
curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
chmod +x /usr/local/bin/docker-compose
- setup_remote_docker

- run:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '2.6.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.2'
gem 'rails', '~> 5.2.5'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.3.6'
# Use Puma as the app server
Expand All @@ -14,7 +14,7 @@ gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby
gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
Expand All @@ -37,7 +37,7 @@ gem 'jbuilder', '~> 2.5'
gem 'bootsnap', '>= 1.1.0', require: false

gem 'execjs'
gem 'therubyracer'
# gem 'therubyracer'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ services:
WALLARM_API_HOST: us1.api.wallarm.com
ports:
- '3000:3000'
platform: linux/x86_64
networks:
main:
aliases:
Expand Down

0 comments on commit bee9335

Please sign in to comment.