From 18176da758d7bd941139d3d1b404bf3829827dc9 Mon Sep 17 00:00:00 2001 From: Felipe Lima Date: Fri, 28 Jun 2024 10:54:45 -0700 Subject: [PATCH 1/3] fix: Move dependencies to gemspec --- .gitignore | 1 + Gemfile | 2 -- Gemfile.lock | 11 ++++++----- eppo-server-sdk.gemspec | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c10a1b5..a6dd3df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.gem .ruby-version spec/test-data +.idea/ diff --git a/Gemfile b/Gemfile index 6773ef2..f7200f1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,3 @@ source 'http://rubygems.org' gemspec - -gem 'semver2', '~> 3.4', '>= 3.4.2' diff --git a/Gemfile.lock b/Gemfile.lock index 19a5888..24e986b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,11 @@ PATH remote: . specs: - eppo-server-sdk (0.2.4) + eppo-server-sdk (0.2.5) concurrent-ruby (~> 1.1, >= 1.1.9) faraday (~> 2.7, >= 2.7.1) faraday-retry (~> 2.0, >= 2.0.0) + semver2 (~> 3.4, >= 3.4.2) GEM remote: http://rubygems.org/ @@ -12,15 +13,15 @@ GEM addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ast (2.4.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) crack (0.4.5) rexml diff-lcs (1.5.0) - faraday (2.9.0) + faraday (2.9.2) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http - faraday-retry (2.2.0) + faraday-retry (2.2.1) faraday (~> 2.0) hashdiff (1.0.1) jaro_winkler (1.5.6) @@ -66,13 +67,13 @@ GEM PLATFORMS aarch64-linux arm64-darwin-21 + arm64-darwin-23 DEPENDENCIES eppo-server-sdk! rake (~> 13.0, >= 13.0.6) rspec (~> 3.12, >= 3.12.0) rubocop (~> 0.82.0) - semver2 (~> 3.4, >= 3.4.2) webmock (~> 3.18, >= 3.18.1) BUNDLED WITH diff --git a/eppo-server-sdk.gemspec b/eppo-server-sdk.gemspec index 886ee20..a99a153 100644 --- a/eppo-server-sdk.gemspec +++ b/eppo-server-sdk.gemspec @@ -14,6 +14,7 @@ Gem::Specification.new do |s| s.add_dependency 'concurrent-ruby', '~> 1.1', '>= 1.1.9' s.add_dependency 'faraday', '~> 2.7', '>= 2.7.1' s.add_dependency 'faraday-retry', '~> 2.0', '>= 2.0.0' + s.add_dependency 'semver2', '~> 3.4', '>= 3.4.2' s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6' s.add_development_dependency 'rspec', '~> 3.12', '>= 3.12.0' s.add_development_dependency 'rubocop', '~> 0.82.0' From f4fb6978a78d0b5d7c28b88dafad227d4af2ef24 Mon Sep 17 00:00:00 2001 From: Felipe Lima Date: Fri, 28 Jun 2024 12:49:29 -0700 Subject: [PATCH 2/3] add .ruby-version file --- .gitignore | 1 - .ruby-version | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .ruby-version diff --git a/.gitignore b/.gitignore index a6dd3df..dcf306f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.gem -.ruby-version spec/test-data .idea/ diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..818bd47 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.0.6 From 9d9db328e53256736e8ceaaae0846a038cb354f7 Mon Sep 17 00:00:00 2001 From: Felipe Lima Date: Fri, 28 Jun 2024 12:53:39 -0700 Subject: [PATCH 3/3] fix setup ruby version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb52459..3001875 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Ruby ${{ matrix.ruby }} - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1 + uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} @@ -30,9 +30,9 @@ jobs: - name: Build run: bundle exec rake build - + - name: Load test data run: bundle exec rake test_refreshed_data - + - name: Run tests run: bundle exec rspec