From e52d408b66ccc9ace72a69216a6e1fd077efa0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl-Ian=20Havard?= Date: Mon, 25 Nov 2024 22:34:16 +0100 Subject: [PATCH 1/4] Update development environment --- Gemfile.lock | 90 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a050915..05ffef6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: https://github.com/hashicorp/vagrant.git - revision: 71150ee3d8c59c2e27acd8278ae0cad99d12f212 + revision: 216835c030e53c4fa48c557100f709ab8366fd0f specs: - vagrant (2.4.2.dev) + vagrant (2.4.4.dev) base64 (~> 0.2.0) bcrypt_pbkdf (~> 1.1) childprocess (~> 4.1.0) @@ -15,18 +15,20 @@ GIT ipaddr (>= 1.2.4) listen (~> 3.7) log4r (~> 1.1.9, < 1.1.11) + logger (~> 1.0) mime-types (~> 3.3) net-ftp (~> 0.2) net-scp (~> 4.0) net-sftp (~> 4.0) net-ssh (~> 7.0) + ostruct (~> 0.6.0) rb-kqueue (~> 0.2.0) rexml (~> 3.2) rgl (~> 0.5.10) rubyzip (~> 2.3.2) - vagrant_cloud (~> 3.1.1) + vagrant_cloud (~> 3.1.2) wdm (~> 0.1.1) - winrm (>= 2.3.6, < 3.0) + winrm (>= 2.3.9, < 3.0) winrm-elevated (>= 1.2.3, < 2.0) winrm-fs (>= 1.3.5, < 2.0) @@ -45,18 +47,24 @@ GEM builder (3.3.0) childprocess (4.1.0) concurrent-ruby (1.3.4) - date (3.3.4) + date (3.4.0) diff-lcs (1.5.1) ed25519 (1.3.0) erubi (1.13.0) - excon (0.112.0) + excon (1.2.1) + faraday (2.12.1) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) - google-protobuf (4.28.2) + google-protobuf (4.28.3) bigdecimal rake (>= 13) googleapis-common-protos-types (1.16.0) google-protobuf (>= 3.18, < 5.a) - grpc (1.66.0) + grpc (1.67.0) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) gssapi (1.3.1) @@ -65,42 +73,60 @@ GEM builder (>= 2.1.2) rexml (~> 3.0) hashicorp-checkpoint (0.1.5) + hashie (5.0.0) httpclient (2.8.3) i18n (1.14.6) concurrent-ruby (~> 1.0) - ipaddr (1.2.6) - json (2.7.2) + ipaddr (1.2.7) + json (2.8.2) + jwt (2.9.3) + base64 language_server-protocol (3.17.0.3) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) little-plugger (1.1.4) log4r (1.1.10) + logger (1.6.1) logging (2.4.0) little-plugger (~> 1.1) multi_json (~> 1.14) - mime-types (3.5.2) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.0903) + mime-types-data (3.2024.1105) multi_json (1.15.0) - net-ftp (0.3.7) + multi_xml (0.7.1) + bigdecimal (~> 3.1) + net-ftp (0.3.8) net-protocol time + net-http (0.5.0) + uri net-protocol (0.2.2) timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-ssh (7.2.3) + net-ssh (7.3.0) nori (2.7.1) bigdecimal + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) + jwt (>= 1.0, < 3.0) + multi_xml (~> 0.5) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + ostruct (0.6.1) pairing_heap (3.1.0) parallel (1.26.3) - parser (3.3.5.0) + parser (3.3.6.0) ast (~> 2.4.1) racc racc (1.8.1) + rack (3.1.8) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) @@ -109,8 +135,7 @@ GEM rb-kqueue (0.2.8) ffi (>= 0.5.0) regexp_parser (2.9.2) - rexml (3.2.9) - strscan + rexml (3.3.9) rgl (0.5.10) pairing_heap (>= 0.3.0) rexml (~> 3.2, >= 3.2.4) @@ -119,16 +144,16 @@ GEM rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.1) + rspec-core (3.13.2) rspec-support (~> 3.13.0) rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-support (3.13.1) - rubocop (1.66.1) + rubocop (1.68.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -138,29 +163,34 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.36.1) parser (>= 3.3.1.0) - rubocop-performance (1.22.1) + rubocop-performance (1.23.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (3.1.0) + rubocop-rspec (3.2.0) rubocop (~> 1.61) ruby-progressbar (1.13.0) rubyntlm (0.6.5) base64 rubyzip (2.3.2) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) stream (0.5.5) - strscan (3.1.0) - time (0.4.0) + time (0.4.1) date - timeout (0.4.1) + timeout (0.4.2) unicode-display_width (2.6.0) - vagrant_cloud (3.1.1) - excon (~> 0.73) - log4r (~> 1.1.10) - rexml (~> 3.2.5) + uri (1.0.2) + vagrant_cloud (3.1.2) + excon (~> 1.0) + log4r (~> 1.1) + oauth2 (~> 2.0) + rexml (~> 3.3) + version_gem (1.1.4) wdm (0.1.1) winrm (2.3.9) builder (>= 2.1.2) From 77ed7c751580b31ac6a7a5e6e1253a74cb67151b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl-Ian=20Havard?= Date: Mon, 25 Nov 2024 22:45:08 +0100 Subject: [PATCH 2/4] Use a specific gemfile for Ruby 3.0 --- .github/workflows/unit-tests.yml | 5 ++++- dev/gemfiles/ruby-3.0.x.gemfile | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 dev/gemfiles/ruby-3.0.x.gemfile diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 96cbbd0..ef398fe 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -10,7 +10,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ["3.0", "3.1", "3.2", "3.3"] + ruby: ["3.1", "3.2", "3.3"] + include: + - ruby: "3.0" + gemfile: dev/gemfiles/ruby-3.0.x.gemfile steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/dev/gemfiles/ruby-3.0.x.gemfile b/dev/gemfiles/ruby-3.0.x.gemfile new file mode 100644 index 0000000..01acd9a --- /dev/null +++ b/dev/gemfiles/ruby-3.0.x.gemfile @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +group :plugins do + # `vagrant-bindfs` (and other plugins that it may depends on) must be in this + # :plugins group to be correcty loaded in development. + gem 'vagrant-bindfs', path: '.' +end + +group :development, :test do + gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git' + gem 'multi_xml', '~> 0.6.0' + + # Development dependencies + gem 'rake' + gem 'rspec', '~> 3.13.0' +end From 883fa2796a9c24dd38de5d4d9cb17c6427419d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl-Ian=20Havard?= Date: Mon, 25 Nov 2024 22:47:58 +0100 Subject: [PATCH 3/4] Fix in configuration --- .github/workflows/unit-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ef398fe..f3ae475 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,6 +14,8 @@ jobs: include: - ruby: "3.0" gemfile: dev/gemfiles/ruby-3.0.x.gemfile + env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps + BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }} steps: - name: Checkout repository uses: actions/checkout@v3 From b32b6b35b84867c5c7c119f54ec73b738811b924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl-Ian=20Havard?= Date: Mon, 25 Nov 2024 22:51:28 +0100 Subject: [PATCH 4/4] Drop tests on Ruby 3.0 --- .github/workflows/unit-tests.yml | 5 ----- dev/gemfiles/ruby-3.0.x.gemfile | 18 ------------------ 2 files changed, 23 deletions(-) delete mode 100644 dev/gemfiles/ruby-3.0.x.gemfile diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f3ae475..9c0f292 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -11,11 +11,6 @@ jobs: strategy: matrix: ruby: ["3.1", "3.2", "3.3"] - include: - - ruby: "3.0" - gemfile: dev/gemfiles/ruby-3.0.x.gemfile - env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps - BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }} steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/dev/gemfiles/ruby-3.0.x.gemfile b/dev/gemfiles/ruby-3.0.x.gemfile deleted file mode 100644 index 01acd9a..0000000 --- a/dev/gemfiles/ruby-3.0.x.gemfile +++ /dev/null @@ -1,18 +0,0 @@ -# frozen_string_literal: true - -source 'https://rubygems.org' - -group :plugins do - # `vagrant-bindfs` (and other plugins that it may depends on) must be in this - # :plugins group to be correcty loaded in development. - gem 'vagrant-bindfs', path: '.' -end - -group :development, :test do - gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git' - gem 'multi_xml', '~> 0.6.0' - - # Development dependencies - gem 'rake' - gem 'rspec', '~> 3.13.0' -end