From 7d31f682bd891e73eb69245370da1c7c02e2697b Mon Sep 17 00:00:00 2001 From: adfoster-r7 Date: Thu, 16 May 2024 10:35:05 +0100 Subject: [PATCH] Update bundler version to 2.5.10 --- .github/workflows/acceptance.yml | 14 ++++---------- .github/workflows/docs.yml | 1 + .github/workflows/ldap_acceptance.yml | 10 ++++------ .github/workflows/lint.yml | 1 + .github/workflows/mssql_acceptance.yml | 8 +++----- .github/workflows/mysql_acceptance.yml | 8 +++----- .github/workflows/postgres_acceptance.yml | 8 +++----- .github/workflows/smb_acceptance.yml | 10 ++++------ .github/workflows/verify.yml | 1 + Gemfile.lock | 2 +- 10 files changed, 25 insertions(+), 38 deletions(-) diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml index 8f1ce7e0fe296..e5a5c6aed9f6e 100644 --- a/.github/workflows/acceptance.yml +++ b/.github/workflows/acceptance.yml @@ -133,16 +133,13 @@ jobs: - name: Setup Ruby env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - name: acceptance env: @@ -185,16 +182,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bea1fb68d8820..8394667853cc9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -50,6 +50,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 working-directory: docs - name: build diff --git a/.github/workflows/ldap_acceptance.yml b/.github/workflows/ldap_acceptance.yml index 2658b4f428cc7..e22e7ae0e8140 100644 --- a/.github/workflows/ldap_acceptance.yml +++ b/.github/workflows/ldap_acceptance.yml @@ -72,13 +72,14 @@ jobs: - name: Setup Ruby env: - BUNDLE_WITHOUT: "coverage development pcap" + BUNDLE_WITH: "coverage development pcap" # Nokogiri doesn't release pre-compiled binaries for preview versions of Ruby; So force compilation with BUNDLE_FORCE_RUBY_PLATFORM BUNDLE_FORCE_RUBY_PLATFORM: "${{ contains(matrix.ruby, 'preview') && 'true' || 'false' }}" uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: acceptance env: @@ -123,16 +124,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eb852742ebee4..6ee7a7e3fe970 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -53,6 +53,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 env: BUNDLE_WITHOUT: "coverage development pcap" diff --git a/.github/workflows/mssql_acceptance.yml b/.github/workflows/mssql_acceptance.yml index f70840eaf5a26..353950e520168 100644 --- a/.github/workflows/mssql_acceptance.yml +++ b/.github/workflows/mssql_acceptance.yml @@ -89,6 +89,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: Extract runtime version run: | @@ -141,16 +142,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/mysql_acceptance.yml b/.github/workflows/mysql_acceptance.yml index 978f807c415d1..0897b8927ec68 100644 --- a/.github/workflows/mysql_acceptance.yml +++ b/.github/workflows/mysql_acceptance.yml @@ -89,6 +89,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: Extract runtime version run: | @@ -141,16 +142,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/postgres_acceptance.yml b/.github/workflows/postgres_acceptance.yml index 48fa60c9fbfa6..5fb68d238f5f8 100644 --- a/.github/workflows/postgres_acceptance.yml +++ b/.github/workflows/postgres_acceptance.yml @@ -89,6 +89,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: Extract runtime version run: | @@ -141,16 +142,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/smb_acceptance.yml b/.github/workflows/smb_acceptance.yml index 15de3eae6eb95..e0e28d17f84c1 100644 --- a/.github/workflows/smb_acceptance.yml +++ b/.github/workflows/smb_acceptance.yml @@ -74,13 +74,14 @@ jobs: - name: Setup Ruby env: - BUNDLE_WITHOUT: "coverage development pcap" + BUNDLE_WITH: "coverage development pcap" # Nokogiri doesn't release pre-compiled binaries for preview versions of Ruby; So force compilation with BUNDLE_FORCE_RUBY_PLATFORM BUNDLE_FORCE_RUBY_PLATFORM: "${{ contains(matrix.ruby, 'preview') && 'true' || 'false' }}" uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: acceptance env: @@ -125,16 +126,13 @@ jobs: - name: Setup Ruby if: always() env: - BUNDLE_WITHOUT: "coverage development" + BUNDLE: "coverage development" BUNDLE_FORCE_RUBY_PLATFORM: true uses: ruby/setup-ruby@v1 with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true - cache-version: 4 - # Github actions with Ruby requires Bundler 2.2.18+ - # https://github.com/ruby/setup-ruby/tree/d2b39ad0b52eca07d23f3aa14fdf2a3fcc1f411c#windows - bundler: 2.2.33 + cache-version: 6 - uses: actions/download-artifact@v4 id: download diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 0147f9dc5413d..cfa1079380acd 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -104,6 +104,7 @@ jobs: with: ruby-version: '${{ matrix.ruby }}' bundler-cache: true + cache-version: 6 - name: Create database run: | diff --git a/Gemfile.lock b/Gemfile.lock index 88df46653e385..58ddff3ede9fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -574,4 +574,4 @@ DEPENDENCIES yard BUNDLED WITH - 2.2.33 + 2.5.10