Skip to content

Commit 1d73e62

Browse files
Merge pull request #3376 from newrelic/dev
Release 10.0.0
2 parents 5861fe4 + abe53d4 commit 1d73e62

File tree

324 files changed

+2022
-7499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+2022
-7499
lines changed

.github/actions/run_multiverse/action.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ runs:
1919
using: "composite"
2020
steps:
2121
# - curl is needed for Curb
22-
# - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
2322
# - sasl is needed for memcached
2423
- name: Install OS packages
2524
shell: bash
2625
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2726

2827
- name: Install Ruby ${{ inputs.ruby-version }}
29-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
28+
uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # tag v1.278.0
3029
with:
3130
ruby-version: ${{ inputs.ruby-version }}
3231

.github/actions/run_perfverse/action.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ inputs:
55
description: 'What agent version to install'
66
required: true
77
agent_env_vars:
8-
description: ''
8+
description: ''
99
required: false
10-
run_time:
11-
description: ''
10+
run_time:
11+
description: ''
1212
required: true
13-
nr_license_key:
14-
description: ''
13+
nr_license_key:
14+
description: ''
1515
required: true
16-
test_tag:
17-
description: ''
16+
test_tag:
17+
description: ''
1818
required: true
19-
docker_monitor_output_dir:
20-
description: ''
19+
docker_monitor_output_dir:
20+
description: ''
2121
required: true
2222
default: docker_monitor_output
2323
run_label:
24-
description: ''
24+
description: ''
2525
required: true
2626
iterations:
2727
description: ''
@@ -32,15 +32,15 @@ runs:
3232
using: "composite"
3333
steps:
3434
- name: Install Ruby
35-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
35+
uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # tag v1.278.0
3636
with:
3737
ruby-version: 3.4
3838

3939
- name: Run ruby script
4040
shell: bash
4141
run: |
4242
ruby ./.github/workflows/scripts/run_perf_tests.rb
43-
env:
43+
env:
4444
AGENT_TAG: ${{ inputs.agent_tag }}
4545
TEST_TAG: ${{ inputs.test_tag }}
4646
RUN_TIME: ${{ inputs.run_time }}

.github/actions/run_unit_tests/action.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ runs:
1313
using: "composite"
1414
steps:
1515
# - curl is needed for Curb
16-
# - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
1716
# - sasl is needed for memcached
1817
- name: Install OS packages
1918
shell: bash
2019
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2120

2221
- name: Install Ruby ${{ inputs.ruby-version }}
23-
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
22+
uses: ruby/setup-ruby@ae195bbe749a7cef685ac729197124a48305c1cb # tag v1.276.0
2423
with:
2524
ruby-version: ${{ inputs.ruby-version }}
2625

@@ -30,12 +29,6 @@ runs:
3029
key: ${{ inputs.ruby-version }}
3130
map: |
3231
{
33-
"2.4.10": {
34-
"rails": "norails,rails52,rails51,rails50,rails42,rails41,rails40"
35-
},
36-
"2.5.9": {
37-
"rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
38-
},
3932
"2.6.10": {
4033
"rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
4134
},
@@ -54,7 +47,10 @@ runs:
5447
"3.3.8": {
5548
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5649
},
57-
"3.4.4": {
50+
"3.4.8": {
51+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
52+
},
53+
"4.0.0": {
5854
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5955
}
6056
}

.github/actions/setup_mysql_tests/action.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,6 @@ inputs:
88
runs:
99
using: "composite"
1010
steps:
11-
# This allows the cache in the following step to be able to write files to the directory needed for mysql
12-
- if: inputs.ruby-version == '2.4.10'
13-
name: Prepare mysql directory
14-
shell: bash
15-
run: sudo chown -R $USER /usr/local
16-
17-
- if: inputs.ruby-version == '2.4.10'
18-
name: Cache mysql55
19-
id: mysql55-cache
20-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
21-
with:
22-
path: /usr/local/mysql55
23-
key: mysql55-install
24-
25-
- if: steps.mysql55-cache.outputs.cache-hit != 'true' && inputs.ruby-version == '2.4.10'
26-
name: Install mysql55
27-
shell: bash
28-
run: sudo ./test/script/install_mysql55
29-
3011
- name: Wait for/Check Mysql
3112
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # tag v3.0.2
3213
with:

.github/workflows/ci.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
steps:
1414
- name: Configure git
1515
run: 'git config --global init.defaultBranch main'
16-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
17-
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
16+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
17+
- uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # tag v1.278.0
1818
with:
19-
ruby-version: 3.4
20-
- run: bundle
19+
ruby-version: 4.0.0
20+
- run: bundle install
2121
- run: rubocop
2222

2323

@@ -36,11 +36,11 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
ruby-version: [2.4.10, 3.4.4]
39+
ruby-version: [2.6.10, 4.0.0]
4040
steps:
4141
- name: Configure git
4242
run: 'git config --global init.defaultBranch main'
43-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
43+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
4444

4545
- name: Run Unit and Env tests
4646
uses: ./.github/actions/run_unit_tests
@@ -56,11 +56,11 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
multiverse: [agent, ai, background, background_2, frameworks, httpclients, httpclients_2, hybrid_agent, rails, rest]
59-
ruby-version: [2.4.10, 3.4.4]
59+
ruby-version: [2.6.10, 4.0.0]
6060
steps:
6161
- name: Configure git
6262
run: 'git config --global init.defaultBranch main'
63-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
63+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
6464

6565
- name: Run Multiverse (${{ matrix.multiverse }})
6666
uses: ./.github/actions/run_multiverse
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-22.04
7575
services:
7676
mongodb:
77-
image: ${{ contains(fromJson('["2.4.10"]'), matrix.ruby-version) && 'mongo:5.0.11' || 'mongo:latest' }}
77+
image: mongo:latest
7878
ports:
7979
- 27017:27017
8080
rabbitmq:
@@ -89,11 +89,11 @@ jobs:
8989
strategy:
9090
fail-fast: false
9191
matrix:
92-
ruby-version: [2.4.10, 3.4.4]
92+
ruby-version: [2.6.10, 4.0.0]
9393
steps:
9494
- name: Configure git
9595
run: 'git config --global init.defaultBranch main'
96-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
96+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
9797

9898
- name: Run Multiverse (services_1)
9999
uses: ./.github/actions/run_multiverse
@@ -139,11 +139,11 @@ jobs:
139139
strategy:
140140
fail-fast: false
141141
matrix:
142-
ruby-version: [2.4.10, 3.4.4]
142+
ruby-version: [2.6.10, 4.0.0]
143143
steps:
144144
- name: Configure git
145145
run: 'git config --global init.defaultBranch main'
146-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
146+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
147147

148148
- name: Run Multiverse (services_2)
149149
uses: ./.github/actions/run_multiverse
@@ -182,11 +182,11 @@ jobs:
182182
strategy:
183183
fail-fast: false
184184
matrix:
185-
ruby-version: [2.4.10, 3.4.4]
185+
ruby-version: [2.6.10, 4.0.0]
186186
steps:
187187
- name: Configure git
188188
run: 'git config --global init.defaultBranch main'
189-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
189+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
190190

191191
- name: Run Multiverse (services_elasticsearch)
192192
uses: ./.github/actions/run_multiverse
@@ -229,11 +229,11 @@ jobs:
229229
strategy:
230230
fail-fast: false
231231
matrix:
232-
ruby-version: [2.4.10, 3.4.4]
232+
ruby-version: [2.6.10, 4.0.0]
233233
steps:
234234
- name: Configure git
235235
run: 'git config --global init.defaultBranch main'
236-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
236+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
237237

238238
- name: Run Multiverse (services_kafka)
239239
uses: ./.github/actions/run_multiverse
@@ -268,11 +268,11 @@ jobs:
268268
strategy:
269269
fail-fast: false
270270
matrix:
271-
ruby-version: [2.4.10, 3.4.4]
271+
ruby-version: [2.6.10, 4.0.0]
272272
steps:
273273
- name: Configure git
274274
run: 'git config --global init.defaultBranch main'
275-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
275+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
276276

277277
- name: Run Multiverse (services_mysql_pg)
278278
uses: ./.github/actions/run_multiverse
@@ -287,11 +287,11 @@ jobs:
287287
strategy:
288288
fail-fast: false
289289
matrix:
290-
ruby-version: [2.7.8, 3.4.4]
290+
ruby-version: [2.7.8, 3.4.8]
291291
steps:
292292
- name: Configure git
293293
run: 'git config --global init.defaultBranch main'
294-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
294+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
295295

296296
- name: Run Multiverse (infinite_tracing)
297297
uses: ./.github/actions/run_multiverse
@@ -309,17 +309,17 @@ jobs:
309309
steps:
310310
- name: Configure git
311311
run: 'git config --global init.defaultBranch main'
312-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # tag v6.0.0
313-
- uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # tag v1.268.0
312+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag v6.0.1
313+
- uses: ruby/setup-ruby@4c24fa5ec04b2e79eb40571b1cee2a0d2b705771 # tag v1.278.0
314314
with:
315-
ruby-version: 3.4
316-
- run: bundle
315+
ruby-version: 4.0.0
316+
- run: bundle install
317317
- name: Download all workflow run artifacts
318-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag v6.0.0
318+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag v7.0.0
319319
- name: Collate Coverage Results
320320
run: bundle exec rake coverage:report
321321
- name: Upload coverage results
322-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag v5.0.0
322+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag v6.0.0
323323
with:
324324
name: coverage-report-combined-${{ matrix.ruby-version }}
325325
path: lib/coverage_results

0 commit comments

Comments
 (0)