From 307db414101cb9db8aad56b967eb669e449d9b30 Mon Sep 17 00:00:00 2001 From: Aaron Averbuch <10715707+ahaverbuch@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:21:54 -0500 Subject: [PATCH 1/2] confg 3.1.0: bump to ruby 3.3.7 by default, test vs 3.2 and 3.3 --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ .gitignore | 3 +-- .ruby-version | 2 +- Gemfile.lock | 31 +++++++++++++++++++++++++++++++ confg.gemspec | 9 ++++++++- lib/confg/version.rb | 6 +++++- 6 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/build.yml create mode 100644 Gemfile.lock diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..690dcdb --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,22 @@ +name: build +on: + pull_request: + push: + branches: + - main +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + ruby-version: [3.2, 3.3] + steps: + - uses: actions/checkout@v4 + with: + show-progress: 'false' + - uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby-version }} + bundler-cache: true # runs `bundle install` and caches installed gems automatically + - run: bundle exec rake diff --git a/.gitignore b/.gitignore index 46a6f15..44b3110 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ /.bundle/ /.yardoc -/Gemfile.lock /_yardoc/ /coverage/ /doc/ @@ -14,4 +13,4 @@ mkmf.log *.gem .byebug_history -/vendor/ \ No newline at end of file +/vendor/ diff --git a/.ruby-version b/.ruby-version index 34cde56..86fb650 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.6 +3.3.7 diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..b717ae5 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,31 @@ +PATH + remote: . + specs: + confg (3.1.0) + +GEM + remote: https://rubygems.org/ + specs: + byebug (11.1.3) + minitest (5.25.4) + rake (13.2.1) + +PLATFORMS + arm64-darwin + ruby + +DEPENDENCIES + bundler + byebug + confg! + minitest (~> 5.0) + rake + +CHECKSUMS + byebug (11.1.3) sha256=2485944d2bb21283c593d562f9ae1019bf80002143cc3a255aaffd4e9cf4a35b + confg (3.1.0) + minitest (5.25.4) sha256=9cf2cae25ac4dfc90c988ebc3b917f53c054978b673273da1bd20bcb0778f947 + rake (13.2.1) sha256=46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d + +BUNDLED WITH + 2.6.3 diff --git a/confg.gemspec b/confg.gemspec index dc6796c..18b47ee 100644 --- a/confg.gemspec +++ b/confg.gemspec @@ -13,7 +13,12 @@ Gem::Specification.new do |spec| spec.summary = "Sets shared variables for applications" spec.homepage = "" - spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR) + + # Specify which files should be added to the gem when it is released. + # The `git ls-files -z` loads the files in the RubyGem that have been added into git. + spec.files = Dir.chdir(File.expand_path(__dir__)) do + `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test)/}) } + end spec.executables = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) } spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] @@ -22,4 +27,6 @@ Gem::Specification.new do |spec| spec.add_development_dependency "byebug" spec.add_development_dependency "minitest", "~> 5.0" spec.add_development_dependency "rake" + + spec.required_ruby_version = ">= 3.2.0" end diff --git a/lib/confg/version.rb b/lib/confg/version.rb index 7570153..6eac55b 100644 --- a/lib/confg/version.rb +++ b/lib/confg/version.rb @@ -2,6 +2,10 @@ module Confg - VERSION = "3.0.1" + MAJOR = 3 + MINOR = 1 + PATCH = 0 + PRERELEASE = nil + VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join(".") end From cc647f785c9842c4606749059015dbe006ab9d4e Mon Sep 17 00:00:00 2001 From: Aaron Averbuch <10715707+ahaverbuch@users.noreply.github.com> Date: Tue, 11 Feb 2025 10:27:12 -0500 Subject: [PATCH 2/2] remove Gemfile.lock --- .gitignore | 1 + Gemfile.lock | 31 ------------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 44b3110..b24c99c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ /doc/ /pkg/ /spec/reports/ +/Gemfile.lock /tmp/ *.bundle *.so diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index b717ae5..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,31 +0,0 @@ -PATH - remote: . - specs: - confg (3.1.0) - -GEM - remote: https://rubygems.org/ - specs: - byebug (11.1.3) - minitest (5.25.4) - rake (13.2.1) - -PLATFORMS - arm64-darwin - ruby - -DEPENDENCIES - bundler - byebug - confg! - minitest (~> 5.0) - rake - -CHECKSUMS - byebug (11.1.3) sha256=2485944d2bb21283c593d562f9ae1019bf80002143cc3a255aaffd4e9cf4a35b - confg (3.1.0) - minitest (5.25.4) sha256=9cf2cae25ac4dfc90c988ebc3b917f53c054978b673273da1bd20bcb0778f947 - rake (13.2.1) sha256=46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d - -BUNDLED WITH - 2.6.3