Skip to content

Commit c478025

Browse files
committed
reverse ci to original
1 parent f2781df commit c478025

File tree

2 files changed

+56
-30
lines changed

2 files changed

+56
-30
lines changed

.github/workflows/ci-contrib.yml

Lines changed: 56 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -242,38 +242,67 @@ jobs:
242242
ruby: "jruby-9.4.12.0"
243243

244244
auto-instrumentation:
245-
strategy:
246-
fail-fast: false
247-
matrix:
248-
gem:
249-
- opentelemetry-auto-instrumentation
250-
os:
251-
- ubuntu-latest
252-
name: "${{ matrix.gem }} / ${{ matrix.os }}"
253-
runs-on: ${{ matrix.os }}
245+
name: "auto-instrumentation / ubuntu-latest"
246+
runs-on: ubuntu-latest
254247
steps:
255248
- uses: actions/checkout@v4
256249
- name: "Test Ruby 3.4"
257-
uses: ./.github/actions/test_gem
250+
uses: ruby/[email protected]
258251
with:
259-
gem: "${{ matrix.gem }}"
260-
ruby: "3.4"
252+
ruby-version: "3.4"
253+
- name: Test Gem
254+
shell: bash
255+
run: |
256+
bundle install --quiet --jobs=3 --retry=4
257+
bundle exec rake test
258+
rm -f Gemfile.lock
259+
working-directory: './opentelemetry-auto-instrumentation'
261260
- name: "Test Ruby 3.3"
262-
uses: ./.github/actions/test_gem
261+
uses: ruby/[email protected]
263262
with:
264-
gem: "${{ matrix.gem }}"
265-
ruby: "3.3"
263+
ruby-version: "3.3"
264+
- name: Test Gem
265+
shell: bash
266+
run: |
267+
bundle install --quiet --jobs=3 --retry=4
268+
bundle exec rake test
269+
rm -f Gemfile.lock
270+
working-directory: './opentelemetry-auto-instrumentation'
266271
- name: "Test Ruby 3.2"
267-
uses: ./.github/actions/test_gem
272+
uses: ruby/[email protected]
268273
with:
269-
gem: "${{ matrix.gem }}"
270-
ruby: "3.2"
271-
yard: true
272-
rubocop: true
273-
build: true
274-
- name: "Test JRuby"
275-
if: "${{ matrix.os == 'ubuntu-latest' }}"
276-
uses: ./.github/actions/test_gem
277-
with:
278-
gem: "${{ matrix.gem }}"
279-
ruby: "jruby-9.4.12.0"
274+
ruby-version: "3.2"
275+
- name: Test Gem
276+
shell: bash
277+
run: |
278+
bundle install --quiet --jobs=3 --retry=4
279+
bundle exec rake test
280+
rm -f Gemfile.lock
281+
working-directory: './opentelemetry-auto-instrumentation'
282+
283+
- name: YARD
284+
shell: bash
285+
run: |
286+
# 📄 Yard Docs 📄
287+
bundle exec rake yard
288+
working-directory: './opentelemetry-auto-instrumentation'
289+
290+
- name: Rubocop
291+
shell: bash
292+
run: |
293+
# 🤖 Rubocop 🤖
294+
bundle exec rake rubocop
295+
working-directory: './opentelemetry-auto-instrumentation'
296+
297+
- name: Coverage
298+
shell: bash
299+
run: |
300+
bundle exec ruby -e 'require "simplecov"; SimpleCov.minimum_coverage(85)'
301+
working-directory: './opentelemetry-auto-instrumentation'
302+
303+
- name: Build Gem
304+
shell: bash
305+
run: |
306+
# 📦 Build Gem 📦
307+
gem build opentelemetry-auto-instrumentation.gemspec
308+
working-directory: './opentelemetry-auto-instrumentation'

opentelemetry-auto-instrumentation/example/app.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
require 'uri'
8-
require 'net/http'
9-
107
url = URI.parse("http://catfact.ninja/fact")
118
req = Net::HTTP::Get.new(url.to_s)
129
res = Net::HTTP.start(url.host, url.port) {|http|

0 commit comments

Comments
 (0)