diff --git a/.github/workflows/next-rails.yml b/.github/workflows/next-rails.yml index 43f03260..6c24660d 100644 --- a/.github/workflows/next-rails.yml +++ b/.github/workflows/next-rails.yml @@ -26,7 +26,7 @@ jobs: echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.4 + ruby-version: 3.3.2 bundler-cache: true - name: Prepare spec run: | diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 7da756c6..008374f3 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.4 + ruby-version: 3.3.2 bundler-cache: true - run: bundle exec rubocop - run: bundle exec haml-lint app/views @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.4 + ruby-version: 3.3.2 bundler-cache: true - name: Prepare spec run: | diff --git a/.ruby-version b/.ruby-version index 0aec50e6..47725433 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.3.2 diff --git a/Dockerfile b/Dockerfile index bd87877c..2e9edc1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,10 @@ USER osem WORKDIR /osem/ # Install our bundle -RUN bundle install --jobs=3 --retry=3 +RUN bundle config set --local path 'vendor/bundle'; \ + bundle install --jobs=4 --retry=3 + +# Install our process manager +RUN gem install foreman CMD ["foreman", "start"] diff --git a/Gemfile b/Gemfile index 05e824ac..d9c836b3 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ end source 'https://rubygems.org' -ruby ENV.fetch('OSEM_RUBY_VERSION', '3.1.4') +ruby '3.3.2' # as web framework if next? diff --git a/Gemfile.lock b/Gemfile.lock index 9c172fb4..01e5a9e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -717,7 +717,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.1.4 + ruby 3.3.2 BUNDLED WITH - 2.3.26 + 2.5.9 diff --git a/dotenv.example b/dotenv.example index 372800ec..b6ca7a36 100644 --- a/dotenv.example +++ b/dotenv.example @@ -32,9 +32,6 @@ # OSEM_MEMCACHED_USERNAME='root' # OSEM_MEMCACHED_PASSWORD='1234' -# Set this if you want to deviate from our 'standard' ruby version -# OSEM_RUBY_VERSION=3.1.2 - # What time is it? # OSEM_TIME_ZONE="UTC"