2023-01-10 10:27:06 +01:00
|
|
|
From 9aea52ee59c4d75375c380cada552c441e0c7008 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: sophia <scastellarin95@gmail.com>
|
|
|
|
|
Date: Tue, 3 Jan 2023 10:41:54 -0800
|
2023-01-17 14:51:02 +01:00
|
|
|
Subject: [PATCH 11/12] Bump Ruby version to 3.x
|
2023-01-10 10:27:06 +01:00
|
|
|
|
|
|
|
|
(cherry picked from commit d69287f8500dd69a7318c608cd63adc9d7922653)
|
|
|
|
|
---
|
|
|
|
|
.github/workflows/build.yml | 2 +-
|
|
|
|
|
.github/workflows/go-spectest.yml | 2 +-
|
|
|
|
|
.github/workflows/go-testing.yml | 2 +-
|
|
|
|
|
.github/workflows/release.yml | 2 +-
|
|
|
|
|
.github/workflows/testing.yml | 2 +-
|
|
|
|
|
vagrant.gemspec | 2 +-
|
|
|
|
|
6 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
|
|
|
|
|
index d1b952739..3f808f538 100644
|
|
|
|
|
--- a/.github/workflows/build.yml
|
|
|
|
|
+++ b/.github/workflows/build.yml
|
|
|
|
|
@@ -20,7 +20,7 @@ jobs:
|
|
|
|
|
- name: Setup Ruby
|
|
|
|
|
uses: ruby/setup-ruby@v1
|
|
|
|
|
with:
|
|
|
|
|
- ruby-version: '2.7'
|
|
|
|
|
+ ruby-version: '3.1'
|
|
|
|
|
- name: Setup Go
|
|
|
|
|
uses: actions/setup-go@v3
|
|
|
|
|
with:
|
|
|
|
|
diff --git a/.github/workflows/go-spectest.yml b/.github/workflows/go-spectest.yml
|
|
|
|
|
index 14e2e89ab..e2188643b 100644
|
|
|
|
|
--- a/.github/workflows/go-spectest.yml
|
|
|
|
|
+++ b/.github/workflows/go-spectest.yml
|
|
|
|
|
@@ -19,7 +19,7 @@ jobs:
|
|
|
|
|
strategy:
|
|
|
|
|
matrix:
|
|
|
|
|
go: ['^1.16']
|
|
|
|
|
- ruby: ['2.7']
|
|
|
|
|
+ ruby: ['3.1']
|
|
|
|
|
name: Vagrant acceptance tests
|
|
|
|
|
steps:
|
|
|
|
|
- name: Code Checkout
|
|
|
|
|
diff --git a/.github/workflows/go-testing.yml b/.github/workflows/go-testing.yml
|
|
|
|
|
index f1f1ea160..5e4b167ac 100644
|
|
|
|
|
--- a/.github/workflows/go-testing.yml
|
|
|
|
|
+++ b/.github/workflows/go-testing.yml
|
|
|
|
|
@@ -26,7 +26,7 @@ jobs:
|
|
|
|
|
strategy:
|
|
|
|
|
matrix:
|
|
|
|
|
go: ['^1.16']
|
|
|
|
|
- ruby: ['2.7', '3.0']
|
|
|
|
|
+ ruby: ['3.0', '3.1']
|
|
|
|
|
name: Vagrant unit tests on Go
|
|
|
|
|
steps:
|
|
|
|
|
- name: Code Checkout
|
|
|
|
|
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
|
|
|
|
|
index adec8556b..9fa1f4dba 100644
|
|
|
|
|
--- a/.github/workflows/release.yml
|
|
|
|
|
+++ b/.github/workflows/release.yml
|
|
|
|
|
@@ -18,7 +18,7 @@ jobs:
|
|
|
|
|
- name: Setup Ruby
|
|
|
|
|
uses: ruby/setup-ruby@v1
|
|
|
|
|
with:
|
|
|
|
|
- ruby-version: '2.7'
|
|
|
|
|
+ ruby-version: '3.1'
|
|
|
|
|
- name: Setup Go
|
|
|
|
|
uses: actions/setup-go@v3
|
|
|
|
|
with:
|
|
|
|
|
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
|
|
|
|
|
index 5cea5043c..a987d9a2e 100644
|
|
|
|
|
--- a/.github/workflows/testing.yml
|
|
|
|
|
+++ b/.github/workflows/testing.yml
|
|
|
|
|
@@ -31,7 +31,7 @@ jobs:
|
|
|
|
|
continue-on-error: true
|
|
|
|
|
strategy:
|
|
|
|
|
matrix:
|
|
|
|
|
- ruby: [ '2.7', '3.0', '3.1' ]
|
|
|
|
|
+ ruby: [ '3.0', '3.1', '3.2' ]
|
|
|
|
|
name: Vagrant unit tests on Ruby ${{ matrix.ruby }}
|
|
|
|
|
steps:
|
|
|
|
|
- name: Code Checkout
|
|
|
|
|
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
|
|
|
|
index 6550462ae..4bcadf949 100644
|
|
|
|
|
--- a/vagrant.gemspec
|
|
|
|
|
+++ b/vagrant.gemspec
|
|
|
|
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
|
|
|
s.summary = "Build and distribute virtualized development environments."
|
|
|
|
|
s.description = "Vagrant is a tool for building and distributing virtualized development environments."
|
|
|
|
|
|
|
|
|
|
- s.required_ruby_version = ">= 2.7", "< 3.2"
|
|
|
|
|
+ s.required_ruby_version = ">= 3.0", "< 3.3"
|
|
|
|
|
s.required_rubygems_version = ">= 1.3.6"
|
|
|
|
|
|
|
|
|
|
s.add_dependency "bcrypt_pbkdf", "~> 1.1"
|
|
|
|
|
--
|
|
|
|
|
2.39.0
|
|
|
|
|
|
