diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f3c97a4d6..85b5ffb61 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.3 + ruby-version: 2.7.4 - name: Increase MySQL max_allowed_packet to 1GB (workaround for unknown/missing service option) run: | sudo apt-get install -y mysql-client diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c5cf7975..47d1d81a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: registry.znuny.com/docker/zammad-ci:2.7.3 + image: registry.znuny.com/docker/zammad-ci:2.7.4 include: - local: '/.gitlab/ci/base.yml' @@ -43,9 +43,9 @@ variables: # Cache gems in between jobs and pipelines # ATTENTION: We use a combination of the Ruby major and minor version number # as a key for the cache to avoid cache growth and incompatibilities between -# the gems. Search hook: 2.7.3 (change it when updating the Ruby version too) +# the gems. Search hook: 2.7.4 (change it when updating the Ruby version too) cache: - key: "centos7ruby273" + key: "centos7ruby274" paths: - vendor/ruby # ATTENTION: This should be a dedicated cache only used in the job "TODO". diff --git a/.ruby-version b/.ruby-version index 2c9b4ef42..a4dd9dba4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.3 +2.7.4 diff --git a/Gemfile b/Gemfile index 36d64d439..aefd16123 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # core - base -ruby '2.7.3' +ruby '2.7.4' gem 'rails', '6.0.4' # core - rails additions diff --git a/Gemfile.lock b/Gemfile.lock index 5a7f4306b..9a36dd0a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -757,7 +757,7 @@ DEPENDENCIES zendesk_api RUBY VERSION - ruby 2.7.3p183 + ruby 2.7.4p191 BUNDLED WITH 2.2.20