From 472491c655a56393dd4ef21603e44cf56bad8093 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 27 Jul 2024 15:41:55 -0400
Subject: [PATCH 1/2] ci: move ruby-head tests into upstream workflow

---
 .github/workflows/ci.yml       |  2 +-
 .github/workflows/upstream.yml | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index daccbae..5a97386 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest, macos-latest]
-        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "head"]
+        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
         exclude:
           # I can't figure out how to install these on macos through setup-ruby
           - ruby: "2.3"
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index 2f73fc6..284b754 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -14,7 +14,26 @@ on:
       - .github/workflows/upstream.yml # this file
 
 jobs:
-  skeleton:
-    runs-on: ubuntu-latest
+  test-unit:
+    env:
+      MAKEFLAGS: -j2
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        ruby: ["head"]
+    runs-on: ${{ matrix.platform }}
     steps:
-      - run: echo "Hello, World!"
+      - name: configure git crlf on windows
+        if: matrix.platform == 'windows-latest'
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+      - uses: actions/checkout@v4
+      - uses: MSP-Greg/setup-ruby-pkgs@v1
+        with:
+          apt-get: _update_ build-essential cmake
+          mingw: _upgrade_ cmake
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake test:unit

From f0bd171722cc5a649952649c01f70114d56d704f Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 27 Jul 2024 15:45:56 -0400
Subject: [PATCH 2/2] dep: move dependencies into Gemfile

and pin webrick to edge because URI parsing has recently been changing
in ruby master and the gem and ruby are out of sync at the moment.
---
 Gemfile               | 13 +++++++++++--
 mini_portile2.gemspec |  7 -------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 99d6ed5..0b61a9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,15 @@
 source 'https://rubygems.org'
 
+gemspec
+
 gem "net-ftp" if Gem::Requirement.new("> 3.1.0.dev").satisfied_by?(Gem::Version.new(RUBY_VERSION))
 
-# Specify your gem's dependencies in mini_portile2.gemspec
-gemspec
+gem "minitar", "0.9"
+gem "minitest", "~> 5.15" # open range for ruby 2.3 support
+gem "minitest-hooks", "1.5.1"
+gem "rake", "13.2.1"
+if RUBY_VERSION >= "3.4"
+  gem "webrick", git: "https://github.com/ruby/webrick" # shouldn't be necessary to pin once webrick 1.8.2 or 1.9.0 is released
+else
+  gem "webrick"
+end
diff --git a/mini_portile2.gemspec b/mini_portile2.gemspec
index 64619cd..b2dd49d 100644
--- a/mini_portile2.gemspec
+++ b/mini_portile2.gemspec
@@ -34,12 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_development_dependency "bundler", "~> 2.2"
-  spec.add_development_dependency "minitar", "~> 0.9"
-  spec.add_development_dependency "minitest", "~> 5.15"
-  spec.add_development_dependency "minitest-hooks", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "webrick", "~> 1.7"
-
   spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
 end