From 95a9dcc4e367161f9efcc7383b111be432aca005 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 2 Jan 2025 15:48:16 +0100 Subject: [PATCH] bump CI dependencies: Ruby 3.4, Ubuntu 24.04 --- .../workflows/add-milestone-to-pull-requests.yml | 2 +- .github/workflows/build-gem.yml | 10 +++++----- .github/workflows/check.yml | 8 ++++---- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/datadog-static-analysis.yml | 2 +- .github/workflows/integration-test.yml | 4 +++- .github/workflows/publish.yml | 4 ++-- .github/workflows/test-memory-leaks.yml | 2 +- .github/workflows/test.yml | 16 ++++++++-------- .github/workflows/yard.yml | 4 ++-- tasks/github.rake | 2 +- 11 files changed, 29 insertions(+), 27 deletions(-) diff --git a/.github/workflows/add-milestone-to-pull-requests.yml b/.github/workflows/add-milestone-to-pull-requests.yml index 85fc5615..c9fc633d 100644 --- a/.github/workflows/add-milestone-to-pull-requests.yml +++ b/.github/workflows/add-milestone-to-pull-requests.yml @@ -9,7 +9,7 @@ jobs: contents: read issues: write pull-requests: write - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.event.pull_request.merged == true && github.event.pull_request.milestone == null steps: - name: Checkout code diff --git a/.github/workflows/build-gem.yml b/.github/workflows/build-gem.yml index b43c735c..77bf694f 100644 --- a/.github/workflows/build-gem.yml +++ b/.github/workflows/build-gem.yml @@ -23,14 +23,14 @@ jobs: type: - final - dev - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Build gem (${{ matrix.type }}) steps: - name: Checkout uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Patch version if: ${{ matrix.type != 'final' }} @@ -107,7 +107,7 @@ jobs: type: - final - dev - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Test gem needs: - build @@ -122,7 +122,7 @@ jobs: find pkg - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' - name: Install gem run: | gem install pkg/*.gem @@ -132,7 +132,7 @@ jobs: matrix: type: - dev - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Push gem needs: - test diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 40eb8767..35efbf86 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -8,24 +8,24 @@ on: jobs: lint: name: Lint - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' - name: Install dependencies run: bundle install - run: bundle exec standardrb typecheck: name: Type checking - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Check for stale signature files run: bundle exec rake rbs:stale diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 48144c8a..7601f4cf 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,7 +10,7 @@ on: jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read diff --git a/.github/workflows/datadog-static-analysis.yml b/.github/workflows/datadog-static-analysis.yml index a186451e..f99fa3f9 100644 --- a/.github/workflows/datadog-static-analysis.yml +++ b/.github/workflows/datadog-static-analysis.yml @@ -4,7 +4,7 @@ name: Datadog Static Analysis jobs: static-analysis: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: Datadog Static Analyzer steps: - name: Checkout diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index ab269e75..afa05251 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -5,13 +5,15 @@ on: jobs: build_and_run_integration_test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: ruby_image: - ruby:3.0 - ruby:3.1 - ruby:3.2 + - ruby:3.3 + - ruby:3.4 steps: - name: Checkout datadog-ci uses: actions/checkout@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 19d95399..34e413f5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,7 +7,7 @@ on: jobs: push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: contents: write @@ -21,5 +21,5 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true - ruby-version: '3.3' + ruby-version: '3.4' - uses: rubygems/release-gem@v1 diff --git a/.github/workflows/test-memory-leaks.yml b/.github/workflows/test-memory-leaks.yml index a9368645..609d368d 100644 --- a/.github/workflows/test-memory-leaks.yml +++ b/.github/workflows/test-memory-leaks.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.4.1 + ruby-version: '3.4' bundler-cache: true # runs 'bundle install' and caches installed gems automatically bundler: latest cache-version: v2 # bump this to invalidate cache diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84ec3ea1..1b7aaace 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ concurrency: cancel-in-progress: "${{ github.ref != 'refs/heads/master' }}" jobs: compute_tasks: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -67,7 +67,7 @@ jobs: name: 'ruby-3.4: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -90,7 +90,7 @@ jobs: name: 'ruby-3.3: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -113,7 +113,7 @@ jobs: name: 'ruby-3.2: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -136,7 +136,7 @@ jobs: name: 'ruby-3.1: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -159,7 +159,7 @@ jobs: name: 'ruby-3.0: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -182,7 +182,7 @@ jobs: name: 'ruby-2.7: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -205,7 +205,7 @@ jobs: name: 'jruby-9.4: ${{ matrix.task }} (${{ matrix.group }})' needs: - compute_tasks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/yard.yml b/.github/workflows/yard.yml index e70f4397..5d09d766 100644 --- a/.github/workflows/yard.yml +++ b/.github/workflows/yard.yml @@ -24,13 +24,13 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: true - name: Generate YARD documentation run: bundle exec rake docs diff --git a/tasks/github.rake b/tasks/github.rake index b05aa867..ed36ec42 100644 --- a/tasks/github.rake +++ b/tasks/github.rake @@ -7,7 +7,7 @@ require_relative 'appraisal_conversion' namespace :github do namespace :actions do task :test_template do |t| - ubuntu = "ubuntu-22.04" + ubuntu = "ubuntu-24.04" runtimes = [ "ruby:3.4",