From 06b717bbda0fc241c2fbddec1816c59f2b268339 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Thu, 20 Aug 2020 10:00:03 +0200 Subject: [PATCH] Maintenance: Updated Ruby dependency to 2.6.6. --- .github/workflows/ci.yaml | 2 +- .gitlab-ci.yml | 6 +++--- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a25aa20e6..b3a9a8234 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -47,7 +47,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.5 + ruby-version: 2.6.6 - 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 0b14c628c..5256d0dbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ default: - image: registry.znuny.com/docker/zammad-ruby:2.6.5 + image: registry.znuny.com/docker/zammad-ruby:2.6.6 include: - local: '/.gitlab/ci/base.yml' @@ -37,9 +37,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.6.5 (change it when updating the Ruby version too) +# the gems. Search hook: 2.6.6 (change it when updating the Ruby version too) cache: - key: "ruby26" + key: "ruby266" paths: - vendor/ruby diff --git a/.ruby-version b/.ruby-version index 57cf282eb..338a5b5d8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.6.6 diff --git a/Gemfile b/Gemfile index 4b71c7913..001c34ef3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # core - base -ruby '2.6.5' +ruby '2.6.6' gem 'rails', '5.2.4.3' # core - rails additions diff --git a/Gemfile.lock b/Gemfile.lock index 86315cd9f..cb0e0a3c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -682,7 +682,7 @@ DEPENDENCIES zendesk_api RUBY VERSION - ruby 2.6.5p114 + ruby 2.6.6p146 BUNDLED WITH 1.17.3