From ca5980860ceb1c7f158e9a58e5f77d56aaa62fe0 Mon Sep 17 00:00:00 2001
From: Orien Madgwick <_@orien.io>
Date: Mon, 10 Jan 2022 05:53:17 +1100
Subject: [PATCH 1/2] Support Ruby 3.0 and 3.1

---
 .github/workflows/test.yml | 2 +-
 CHANGELOG.md               | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c68b351..6c693794 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04 ]
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
+        ruby: [ '2.4', '2.5', '2.6', '2.7', '3.0', '3.1' ]
         include:
           - os: macos-latest
             ruby: '2.7'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f1fb0c0..3f9ad195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,12 @@ The format is based on [Keep a Changelog], and this project adheres to
 
 ## [Unreleased]
 
+### Added
+
+- Test on Ruby 3.0 and 3.1 in the CI build ([#366]).
+
 [Unreleased]: https://github.com/envato/stack_master/compare/v2.13.1...HEAD
+[#366]: https://github.com/envato/stack_master/pull/366
 
 ## [2.13.1] - 2021-10-11
 

From fbdfa94bb919eba3f6da6876cc4c31a5ddde2739 Mon Sep 17 00:00:00 2001
From: Orien Madgwick <_@orien.io>
Date: Mon, 10 Jan 2022 05:55:17 +1100
Subject: [PATCH 2/2] Resolve SparkleFormation Ruby 3 issue

---
 Gemfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 677a9ea3..96049c5f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stack_master.gemspec
 gemspec
+
+if RUBY_VERSION >= '3.0.0'
+  # SparkleFormation has an issue with Ruby 3 and the SortedSet class.
+  # Remove after merged: https://github.com/sparkleformation/sparkle_formation/pull/271
+  gem 'faux_sorted_set', require: false
+end