Merge pull request #3412 from ashie/ci-drop-ruby-2.5

CI: Drop Ruby 2.5
fluent · Jun 7, 2021 · 980425e · 980425e
2 parents 3f4c267 + b6fe674
commit 980425e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/.github/workflows/linux-test.yaml b/.github/workflows/linux-test.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '2.7', '2.6', '2.5']
+        ruby-version: ['3.0', '2.7', '2.6']
         os: [ubuntu-latest]
         experimental: [false]
         include:

diff --git a/.github/workflows/windows-test.yaml b/.github/workflows/windows-test.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7', '2.6', '2.5']
+        ruby-version: ['2.7', '2.6']
         os:
           - windows-latest
         experimental: [false]

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -13,16 +13,6 @@ stages:
   - build
   - tests
 
-2-5-8:
-  image: "ruby:2.5.8"
-  stage: build
-  extends: .install-template
-  script:
-    - bundle install --jobs=3 --retry=3
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-5-8"
-    paths:
-
 2-6-6:
   image: "ruby:2.6.6"
   stage: build
@@ -64,18 +54,6 @@ rubyhead:
     paths:
       - ./*
 
-2-5-8-test:
-  image: "ruby:2.5.8"
-  stage: tests
-  allow_failure: true
-  extends: .test-template
-  script:
-    - bundle exec rake test
-  cache:
-    key: "$CI_COMMIT_REF_SLUG 2-5-8"
-    paths:
-      - ./*
-
 2-6-6-test:
   image: "ruby:2.6.6"
   stage: tests