diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index ad9b765c9..ba35120ba 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -12,39 +12,31 @@ permissions: pull-requests: write jobs: - release: + prepare: name: Process Release runs-on: ubuntu-latest steps: - - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e - id: release + - uses: google-github-actions/release-please-action@v4.0.2 + id: prepare outputs: - paths_released: ${{ steps.release.outputs.paths_released }} + paths_released: ${{ steps.prepare.outputs.paths_released }} publish: - needs: release + needs: prepare name: Publish Gems runs-on: ubuntu-latest - if: ${{ needs.release.outputs.paths_released != '[]'}} + if: ${{ needs.prepare.outputs.paths_released != '[]'}} strategy: fail-fast: false max-parallel: 1 matrix: - path: ${{ fromJson(needs.release.outputs.paths_released) }} + path: ${{ fromJson(needs.prepare.outputs.paths_released) }} steps: - - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - - name: Setup Ruby - uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 - with: - ruby-version: 3.0.0 - bundler: latest - bundler-cache: false - + - name: Checkout Repository + uses: actions/checkout@v4.1.1 - name: Configure RubyGems env: GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}" @@ -55,9 +47,15 @@ jobs: chmod 0600 $HOME/.gem/credentials printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials - - name: Release Gem + - uses: ruby/setup-ruby@v1.165.1 + with: + ruby-version: "3.0" + bundler: latest + bundler-cache: false + working-directory: ${{ matrix.path }} + + - name: Publish to RubyGems working-directory: ${{ matrix.path }} run: | - bundle install bundle exec rake --trace build bundle exec rake --trace release:rubygem_push diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7adc63ff6..ae436efa7 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -4,10 +4,10 @@ "instrumentation/racecar": "0.3.0", "instrumentation/rake": "0.2.1", "instrumentation/rdkafka": "0.4.2", - "instrumentation/trilogy": "0.57.0", + "instrumentation/trilogy": "0.58.0", "instrumentation/active_support": "0.5.1", "instrumentation/action_view": "0.7.0", - "instrumentation/action_pack": "0.8.0", + "instrumentation/action_pack": "0.9.0", "instrumentation/active_job": "0.7.1", "instrumentation/resque": "0.5.0", "instrumentation/bunny": "0.21.1", @@ -32,15 +32,15 @@ "instrumentation/net_http": "0.22.4", "instrumentation/pg": "0.26.1", "instrumentation/que": "0.7.1", - "instrumentation/rack": "0.23.5", - "instrumentation/rails": "0.29.1", + "instrumentation/rack": "0.24.0", + "instrumentation/rails": "0.30.0", "instrumentation/redis": "0.25.3", "instrumentation/restclient": "0.22.3", "instrumentation/rspec": "0.3.2", "instrumentation/ruby_kafka": "0.21.0", "instrumentation/sidekiq": "0.25.0", "instrumentation/sinatra": "0.23.2", - "instrumentation/all": "0.54.0", + "instrumentation/all": "0.56.0", "propagator/ottrace": "0.21.2", "propagator/xray": "0.22.1", "resources/azure": "0.1.0", diff --git a/Gemfile b/Gemfile index bc32156cc..49af8744c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,4 +8,4 @@ source 'https://rubygems.org' gem 'rake', '~> 13.0' gem 'rubocop', '~> 1.59.0' -gem 'rubocop-performance', '~> 1.19.1' +gem 'rubocop-performance', '~> 1.20.2' diff --git a/release-please-config.json b/release-please-config.json index 022572d77..3400dd779 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -2,11 +2,12 @@ "bump-minor-pre-major": true, "bump-patch-for-minor-pre-major": true, "draft": true, + "draft-pull-request": true, "include-component-in-tag": true, "include-v-in-tag": true, "prerelease": true, "release-type": "ruby", - "separate-pull-requests": false, + "separate-pull-requests": true, "sequential-calls": true, "signoff": "OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>", "skip-github-release": false,