From b0e6cc5dbf836b085ec60486f06f4755d1457638 Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:07:50 -0400 Subject: [PATCH 1/8] wip --- .gitignore | 4 ++++ Appraisals | 14 ++++++++++++++ Gemfile | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 Appraisals diff --git a/.gitignore b/.gitignore index d82e0c1..7f4df8e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,10 @@ build/ Gemfile.lock +# Appraisal generates gemfiles for testing different dependency versions +# Include the gemfiles but exclude their lock files +/gemfiles/*.lock + # for a library or gem, you might want to ignore these files since the code is # intended to run in multiple environments; otherwise, check them in: # Gemfile.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 0000000..a13d470 --- /dev/null +++ b/Appraisals @@ -0,0 +1,14 @@ +appraise "activerecord-6.1" do + gem "activerecord", "~> 6.1.0" + gem "concurrent-ruby", "1.3.4" +end + +appraise "activerecord-7.0" do + gem "activerecord", "~> 7.0.0" + gem "concurrent-ruby", "1.3.4" +end + +appraise "activerecord-7.1" do + gem "activerecord", "~> 7.1.0" + gem "concurrent-ruby", "1.3.5" +end diff --git a/Gemfile b/Gemfile index 41793ee..74218d2 100644 --- a/Gemfile +++ b/Gemfile @@ -15,3 +15,7 @@ else end gem "activerecord", ar + +group :development, :test do + gem "appraisal", "2.5.0" +end \ No newline at end of file From d9c30cbce0219924ea8842551cc6e32ca0ae0929 Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:19:55 -0400 Subject: [PATCH 2/8] add gemfiles/* to gitignore --- .gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f4df8e..7eef89c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,9 +26,8 @@ build/ Gemfile.lock -# Appraisal generates gemfiles for testing different dependency versions -# Include the gemfiles but exclude their lock files -/gemfiles/*.lock +# Do not copy generated appraisal Gemfiles +gemfiles/* # for a library or gem, you might want to ignore these files since the code is # intended to run in multiple environments; otherwise, check them in: From a9aea94e6ed1fabd5d91f3693427e64d1c7e69c0 Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:23:04 -0400 Subject: [PATCH 3/8] run dev tests for all active-record versions --- dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.yml b/dev.yml index 06b7282..60bfd8d 100644 --- a/dev.yml +++ b/dev.yml @@ -8,4 +8,4 @@ setup: commands: test: summary: Run the project's specs - command: bundle exec rspec spec/ + command: bundle exec appraisal rspec spec/ From 37d392f212a019c38330dbca11badf3ca5dc3341 Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:30:14 -0400 Subject: [PATCH 4/8] testing ci for all ruby and active-rcord combinations --- .github/workflows/ci.yaml | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7458c30..ff17935 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,25 +18,25 @@ jobs: - 3.0 - 3.1 - 3.2 - active-record-version: - - 6.1.0 - - 7.0.0 - - 7.1.0 - exclude: - - ruby-version: 3.2 - active-record-version: 6.0.0 - - ruby-version: 3.2 - active-record-version: 6.1.0 - - ruby-version: 3.2 - active-record-version: 7.0.0 - - ruby-version: 3.1 - active-record-version: 6.0.0 - - ruby-version: 3.1 - active-record-version: 6.1.0 - - ruby-version: 3.0 - active-record-version: 6.0.0 - env: - ACTIVE_RECORD_VERSION: "${{ matrix.active-record-version }}" + # active-record-version: + # - 6.1.0 + # - 7.0.0 + # - 7.1.0 + # exclude: + # - ruby-version: 3.2 + # active-record-version: 6.0.0 + # - ruby-version: 3.2 + # active-record-version: 6.1.0 + # - ruby-version: 3.2 + # active-record-version: 7.0.0 + # - ruby-version: 3.1 + # active-record-version: 6.0.0 + # - ruby-version: 3.1 + # active-record-version: 6.1.0 + # - ruby-version: 3.0 + # active-record-version: 6.0.0 + # env: + # ACTIVE_RECORD_VERSION: "${{ matrix.active-record-version }}" steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -44,4 +44,4 @@ jobs: ruby-version: "${{ matrix.ruby-version }}" bundler-cache: true - name: Run tests - run: bundle exec rspec --format documentation + run: bundle exec appraisal rspec --format documentation From f19ce4df92351a64bc16f296a2f57876a7d737ee Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:36:08 -0400 Subject: [PATCH 5/8] appraisal install --- .github/workflows/ci.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ff17935..d9cdd58 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -44,4 +44,6 @@ jobs: ruby-version: "${{ matrix.ruby-version }}" bundler-cache: true - name: Run tests - run: bundle exec appraisal rspec --format documentation + run: | + bundle exec appraisal install + bundle exec appraisal rspec --format documentation From 76e848c8e57d7ca4b86e5162a04cd5c3efe86121 Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Tue, 3 Jun 2025 11:39:00 -0400 Subject: [PATCH 6/8] cleanup --- .github/workflows/ci.yaml | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d9cdd58..30bae1a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,28 +15,9 @@ jobs: fail-fast: false matrix: ruby-version: - - 3.0 - - 3.1 - - 3.2 - # active-record-version: - # - 6.1.0 - # - 7.0.0 - # - 7.1.0 - # exclude: - # - ruby-version: 3.2 - # active-record-version: 6.0.0 - # - ruby-version: 3.2 - # active-record-version: 6.1.0 - # - ruby-version: 3.2 - # active-record-version: 7.0.0 - # - ruby-version: 3.1 - # active-record-version: 6.0.0 - # - ruby-version: 3.1 - # active-record-version: 6.1.0 - # - ruby-version: 3.0 - # active-record-version: 6.0.0 - # env: - # ACTIVE_RECORD_VERSION: "${{ matrix.active-record-version }}" + - "3.0" + - "3.1" + - "3.2" steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 From 0245cf98d2f8e42af186954726395844e08ca4dc Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Wed, 4 Jun 2025 12:13:11 -0400 Subject: [PATCH 7/8] addressing comments --- Appraisals | 2 +- Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index a13d470..7a82df6 100644 --- a/Appraisals +++ b/Appraisals @@ -10,5 +10,5 @@ end appraise "activerecord-7.1" do gem "activerecord", "~> 7.1.0" - gem "concurrent-ruby", "1.3.5" + gem "concurrent-ruby" end diff --git a/Gemfile b/Gemfile index 74218d2..eff579c 100644 --- a/Gemfile +++ b/Gemfile @@ -18,4 +18,4 @@ gem "activerecord", ar group :development, :test do gem "appraisal", "2.5.0" -end \ No newline at end of file +end From 141e02c2e5393d3c44edaa861fafa5b895c1a2af Mon Sep 17 00:00:00 2001 From: Abdur Rahman Date: Wed, 4 Jun 2025 14:48:52 -0400 Subject: [PATCH 8/8] bump up the gem version --- lib/inheritance_integer_type/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/inheritance_integer_type/version.rb b/lib/inheritance_integer_type/version.rb index 17d494e..afb9255 100644 --- a/lib/inheritance_integer_type/version.rb +++ b/lib/inheritance_integer_type/version.rb @@ -1,3 +1,3 @@ module InheritanceIntegerType - VERSION = "0.2.0" + VERSION = "0.2.1" end