diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 025c57d692f..d9303fa5877 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,19 +17,19 @@ concurrency: jobs: batch-ruby-34: runs-on: ubuntu-24.04 - name: Batch ruby-3.4 + name: Batch (ruby-3.4) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:3.4 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-34-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-34-${{ hashFiles('*.lock') }} @@ -37,7 +37,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -53,7 +53,7 @@ jobs: needs: - batch-ruby-34 runs-on: ubuntu-24.04 - name: Build & Test ruby-3.4[${{ matrix.batch }}] + name: Build & Test (ruby-3.4) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -78,6 +78,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -125,13 +126,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-34-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-34.outputs.cache-key }}" @@ -140,24 +141,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-33: runs-on: ubuntu-24.04 - name: Batch ruby-3.3 + name: Batch (ruby-3.3) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:3.3 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-33-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-33-${{ hashFiles('*.lock') }} @@ -165,7 +166,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -181,7 +182,7 @@ jobs: needs: - batch-ruby-33 runs-on: ubuntu-24.04 - name: Build & Test ruby-3.3[${{ matrix.batch }}] + name: Build & Test (ruby-3.3) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -206,6 +207,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -253,13 +255,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-33-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-33.outputs.cache-key }}" @@ -268,24 +270,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-32: runs-on: ubuntu-24.04 - name: Batch ruby-3.2 + name: Batch (ruby-3.2) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:3.2 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-32-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-32-${{ hashFiles('*.lock') }} @@ -293,7 +295,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -309,7 +311,7 @@ jobs: needs: - batch-ruby-32 runs-on: ubuntu-24.04 - name: Build & Test ruby-3.2[${{ matrix.batch }}] + name: Build & Test (ruby-3.2) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -334,6 +336,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -381,13 +384,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-32-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-32.outputs.cache-key }}" @@ -396,24 +399,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-31: runs-on: ubuntu-24.04 - name: Batch ruby-3.1 + name: Batch (ruby-3.1) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:3.1 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-31-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-31-${{ hashFiles('*.lock') }} @@ -421,7 +424,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -437,7 +440,7 @@ jobs: needs: - batch-ruby-31 runs-on: ubuntu-24.04 - name: Build & Test ruby-3.1[${{ matrix.batch }}] + name: Build & Test (ruby-3.1) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -462,6 +465,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -509,13 +513,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-31-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-31.outputs.cache-key }}" @@ -524,24 +528,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-30: runs-on: ubuntu-24.04 - name: Batch ruby-3.0 + name: Batch (ruby-3.0) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:3.0 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-30-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-30-${{ hashFiles('*.lock') }} @@ -549,7 +553,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -565,7 +569,7 @@ jobs: needs: - batch-ruby-30 runs-on: ubuntu-24.04 - name: Build & Test ruby-3.0[${{ matrix.batch }}] + name: Build & Test (ruby-3.0) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -590,6 +594,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -637,13 +642,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-30-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-30.outputs.cache-key }}" @@ -652,24 +657,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-27: runs-on: ubuntu-24.04 - name: Batch ruby-2.7 + name: Batch (ruby-2.7) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:2.7 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-27-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-27-${{ hashFiles('*.lock') }} @@ -677,7 +682,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -693,7 +698,7 @@ jobs: needs: - batch-ruby-27 runs-on: ubuntu-24.04 - name: Build & Test ruby-2.7[${{ matrix.batch }}] + name: Build & Test (ruby-2.7) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -718,6 +723,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -765,13 +771,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-27-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-27.outputs.cache-key }}" @@ -780,24 +786,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-26: runs-on: ubuntu-24.04 - name: Batch ruby-2.6 + name: Batch (ruby-2.6) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:2.6 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-26-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-26-${{ hashFiles('*.lock') }} @@ -805,7 +811,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -821,7 +827,7 @@ jobs: needs: - batch-ruby-26 runs-on: ubuntu-24.04 - name: Build & Test ruby-2.6[${{ matrix.batch }}] + name: Build & Test (ruby-2.6) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -846,6 +852,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -893,13 +900,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-26-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-26.outputs.cache-key }}" @@ -908,24 +915,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-ruby-25: runs-on: ubuntu-24.04 - name: Batch ruby-2.5 + name: Batch (ruby-2.5) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/ruby:2.5 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-ruby-25-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-ruby-25-${{ hashFiles('*.lock') }} @@ -933,7 +940,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -949,7 +956,7 @@ jobs: needs: - batch-ruby-25 runs-on: ubuntu-24.04 - name: Build & Test ruby-2.5[${{ matrix.batch }}] + name: Build & Test (ruby-2.5) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -974,6 +981,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -1021,13 +1029,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-ruby-25-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-ruby-25.outputs.cache-key }}" @@ -1036,24 +1044,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-jruby-94: runs-on: ubuntu-24.04 - name: Batch jruby-9.4 + name: Batch (jruby-9.4) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/jruby:9.4 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-jruby-94-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-jruby-94-${{ hashFiles('*.lock') }} @@ -1061,7 +1069,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -1077,7 +1085,7 @@ jobs: needs: - batch-jruby-94 runs-on: ubuntu-24.04 - name: Build & Test jruby-9.4[${{ matrix.batch }}] + name: Build & Test (jruby-9.4) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -1102,6 +1110,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -1149,13 +1158,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-jruby-94-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-jruby-94.outputs.cache-key }}" @@ -1164,24 +1173,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-jruby-93: runs-on: ubuntu-24.04 - name: Batch jruby-9.3 + name: Batch (jruby-9.3) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/jruby:9.3 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-jruby-93-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-jruby-93-${{ hashFiles('*.lock') }} @@ -1189,7 +1198,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -1205,7 +1214,7 @@ jobs: needs: - batch-jruby-93 runs-on: ubuntu-24.04 - name: Build & Test jruby-9.3[${{ matrix.batch }}] + name: Build & Test (jruby-9.3) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -1230,6 +1239,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -1277,13 +1287,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-jruby-93-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-jruby-93.outputs.cache-key }}" @@ -1292,24 +1302,24 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true batch-jruby-92: runs-on: ubuntu-24.04 - name: Batch jruby-9.2 + name: Batch (jruby-9.2) outputs: batches: "${{ steps.set-batches.outputs.batches }}" cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}" container: ghcr.io/datadog/images-rb/engines/jruby:9.2 steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - run: bundle lock - - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 + - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: lockfile-jruby-92-${{ github.run_id }} path: "*.lock" - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: bundle-${{ runner.os }}-${{ runner.arch }}-jruby-92-${{ hashFiles('*.lock') }} @@ -1317,7 +1327,7 @@ jobs: - if: steps.restore-cache.outputs.cache-hit != 'true' run: bundle install - if: steps.restore-cache.outputs.cache-hit != 'true' - uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + uses: actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57 with: key: "${{ steps.restore-cache.outputs.cache-primary-key }}" path: "/usr/local/bundle" @@ -1333,7 +1343,7 @@ jobs: needs: - batch-jruby-92 runs-on: ubuntu-24.04 - name: Build & Test jruby-9.2[${{ matrix.batch }}] + name: Build & Test (jruby-9.2) [${{ matrix.batch }}] env: BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}" strategy: @@ -1358,6 +1368,7 @@ jobs: DD_TRACE_AGENT_PORT: '9126' DATADOG_GEM_CI: 'true' TEST_DATADOG_INTEGRATION: '1' + JRUBY_OPTS: "--dev" services: postgres: image: ghcr.io/datadog/images-rb/services/postgres:9.6 @@ -1405,13 +1416,13 @@ jobs: DD_DISABLE_ERROR_RESPONSES: 'true' ENABLED_CHECKS: trace_content_length,trace_stall,meta_tracer_version_header,trace_count_header,trace_peer_service,trace_dd_service steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Configure Git run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: name: lockfile-jruby-92-${{ github.run_id }} - - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0 + - uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 id: restore-cache with: key: "${{ needs.batch-jruby-92.outputs.cache-key }}" @@ -1420,7 +1431,7 @@ jobs: - run: bundle exec rake github:run_batch_build - run: bundle exec rake github:run_batch_tests - if: "${{ failure() && env.RUNNER_DEBUG == '1' }}" - uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 # v3.19.0 + uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48 with: limit-access-to-actor: true unit-tests: diff --git a/tasks/github.rake b/tasks/github.rake index eb60f0bf46a..5a7e85f52ab 100644 --- a/tasks/github.rake +++ b/tasks/github.rake @@ -99,24 +99,24 @@ namespace :github do runtimes.each do |runtime| jobs[runtime.batch_id] = { 'runs-on' => ubuntu, - 'name' => "Batch #{runtime.engine}-#{runtime.version}", + 'name' => "Batch (#{runtime.engine}-#{runtime.version})", 'outputs' => { 'batches' => '${{ steps.set-batches.outputs.batches }}', 'cache-key' => '${{ steps.restore-cache.outputs.cache-primary-key }}' }, 'container' => runtime.image, 'steps' => [ - { 'uses' => 'actions/checkout@v4' }, + { 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' }, { 'run' => 'bundle lock' }, { - 'uses' => 'actions/upload-artifact@v4', + 'uses' => 'actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08', 'with' => { 'name' => runtime.lockfile_artifact, 'path' => '*.lock' } }, { - 'uses' => 'actions/cache/restore@v4', + 'uses' => 'actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57', 'id' => 'restore-cache', 'with' => { 'key' => runtime.bundle_cache_key, @@ -126,7 +126,7 @@ namespace :github do { 'if' => "steps.restore-cache.outputs.cache-hit != 'true'", 'run' => 'bundle install' }, { 'if' => "steps.restore-cache.outputs.cache-hit != 'true'", - 'uses' => 'actions/cache/save@v4', + 'uses' => 'actions/cache/save@1bd1e32a3bdc45362d1e726936510720a7c30a57', 'with' => { 'key' => '${{ steps.restore-cache.outputs.cache-primary-key }}', 'path' => '/usr/local/bundle' @@ -153,7 +153,7 @@ namespace :github do runtime.batch_id, ], 'runs-on' => ubuntu, - 'name' => "Build & Test #{runtime.engine}-#{runtime.version}[${{ matrix.batch }}]", + 'name' => "Build & Test (#{runtime.engine}-#{runtime.version}) [${{ matrix.batch }}]", 'env' => { 'BATCHED_TASKS' => '${{ toJSON(matrix.tasks) }}' }, 'strategy' => { 'fail-fast' => false, @@ -179,6 +179,7 @@ namespace :github do 'DD_TRACE_AGENT_PORT' => '9126', 'DATADOG_GEM_CI' => 'true', 'TEST_DATADOG_INTEGRATION' => '1', + 'JRUBY_OPTS' => '--dev', # Faster JVM startup: https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag } }, 'services' => { @@ -193,19 +194,19 @@ namespace :github do 'agent' => agent, }, 'steps' => [ - { 'uses' => 'actions/checkout@v4' }, + { 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' }, { 'name' => 'Configure Git', 'run' => 'git config --global --add safe.directory "$GITHUB_WORKSPACE"' }, { - 'uses' => 'actions/download-artifact@v4', + 'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16', 'with' => { 'name' => runtime.lockfile_artifact, } }, { - 'uses' => 'actions/cache/restore@v4', + 'uses' => 'actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57', 'id' => 'restore-cache', 'with' => { 'key' => "${{ needs.#{runtime.batch_id}.outputs.cache-key }}", @@ -217,7 +218,7 @@ namespace :github do { 'run' => 'bundle exec rake github:run_batch_tests' }, { 'if' => "${{ failure() && env.RUNNER_DEBUG == '1' }}", - 'uses' => 'mxschmitt/action-tmate@v3', + 'uses' => 'mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48', 'with' => { 'limit-access-to-actor' => true, }