Skip to content

Commit da9e799

Browse files
committed
Merge branch 'dev' into sidekiq_retry_backup
2 parents b4a1500 + 0f7ccf4 commit da9e799

File tree

118 files changed

+2860
-159
lines changed

Some content is hidden

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

118 files changed

+2860
-159
lines changed
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: 'Run Perfverse'
2+
description: 'Runs performance testing on the specified agent tag'
3+
inputs:
4+
agent_tag:
5+
description: 'What agent version to install'
6+
required: true
7+
agent_env_vars:
8+
description: ''
9+
required: false
10+
run_time:
11+
description: ''
12+
required: true
13+
nr_license_key:
14+
description: ''
15+
required: true
16+
test_tag:
17+
description: ''
18+
required: true
19+
docker_monitor_output_dir:
20+
description: ''
21+
required: true
22+
default: docker_monitor_output
23+
run_label:
24+
description: ''
25+
required: true
26+
iterations:
27+
description: ''
28+
required: true
29+
default: 3
30+
31+
runs:
32+
using: "composite"
33+
steps:
34+
- name: Install Ruby
35+
uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
36+
with:
37+
ruby-version: 3.4
38+
39+
- name: Run ruby script
40+
shell: bash
41+
run: |
42+
ruby ./.github/workflows/scripts/run_perf_tests.rb
43+
env:
44+
AGENT_TAG: ${{ inputs.agent_tag }}
45+
TEST_TAG: ${{ inputs.test_tag }}
46+
RUN_TIME: ${{ inputs.run_time }}
47+
NR_LICENSE_KEY: ${{ inputs.nr_license_key }}
48+
DOCKER_MONITOR_OUTPUT_DIR: ${{ inputs.docker_monitor_output_dir }}
49+
ITERATIONS: ${{ inputs.iterations }}
50+
51+
- name: Upload docker report
52+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
53+
with:
54+
if-no-files-found: error
55+
path: test/perfverse/docker_monitor/${{ inputs.docker_monitor_output_dir}}/
56+
name: docker_monitor_report-${{ inputs.run_label }}
57+
retention-days: 1
58+
59+
60+
61+
62+
63+
64+
65+
66+
67+
68+
69+

.github/actions/run_unit_tests/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ runs:
4949
"rails": "norails,rails61,rails70,rails71,rails72"
5050
},
5151
"3.2.8": {
52-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
52+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5353
},
5454
"3.3.8": {
55-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
55+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5656
},
5757
"3.4.4": {
58-
"rails": "norails,rails61,rails70,rails71,rails72,rails80,railsedge"
58+
"rails": "norails,rails61,rails70,rails71,rails72,rails80"
5959
}
6060
}
6161

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Configure git
1515
run: 'git config --global init.defaultBranch main'
1616
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
17-
- uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
17+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1818
with:
1919
ruby-version: 3.4
2020
- run: bundle
@@ -310,16 +310,16 @@ jobs:
310310
- name: Configure git
311311
run: 'git config --global init.defaultBranch main'
312312
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
313-
- uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
313+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
314314
with:
315315
ruby-version: 3.4
316316
- run: bundle
317317
- name: Download all workflow run artifacts
318-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag v5.0.0
318+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag v6.0.0
319319
- name: Collate Coverage Results
320320
run: bundle exec rake coverage:report
321321
- name: Upload coverage results
322-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
322+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag v5.0.0
323323
with:
324324
name: coverage-report-combined-${{ matrix.ruby-version }}
325325
path: lib/coverage_results

.github/workflows/ci_cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Configure git
1717
run: 'git config --global init.defaultBranch main'
1818
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
19-
- uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
19+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2020
with:
2121
ruby-version: 3.4
2222
- run: bundle

.github/workflows/ci_jruby.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
1717

1818
- name: Install JRuby
19-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
19+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2020
with:
2121
ruby-version: jruby-9.4.14.0
2222

@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
5050

5151
- name: Install JRuby
52-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
52+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
5353
with:
5454
ruby-version: jruby-9.4.14.0
5555

@@ -97,7 +97,7 @@ jobs:
9797
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
9898

9999
- name: Install JRuby
100-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
100+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
101101
with:
102102
ruby-version: jruby-9.4.14.0
103103

.github/workflows/ci_special.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
2222

2323
- name: Install Ruby 3.4
24-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
24+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
2525
with:
2626
ruby-version: 3.4
2727

.github/workflows/config_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
steps:
1717
- name: Install Ruby 3.4
18-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
18+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1919
with:
2020
ruby-version: 3.4
2121

.github/workflows/lambda_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
contents: write
1515
repository-projects: write
1616
steps:
17-
- uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
17+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1818
with:
1919
ruby-version: 3.4
2020

.github/workflows/performance_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
3434
with:
3535
ref: 'main'
36-
- uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
36+
- uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
3737
with:
3838
ruby-version: 3.4
3939
- run: bundle
@@ -42,7 +42,7 @@ jobs:
4242
- run: bundle
4343
- run: bundle exec script/runner -C -M > performance_results.md
4444
- name: Save performance results
45-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag v4.6.2
45+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag v5.0.0
4646
with:
4747
name: performance-test-results-${{ matrix.ruby-version }}
4848
path: ./test/performance/performance_results.md

.github/workflows/prerelease.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
pull-requests: write
1212
steps:
1313
- name: Install Ruby 3.4
14-
uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # tag v1.263.0
14+
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
1515
with:
1616
ruby-version: 3.4
1717

@@ -45,7 +45,7 @@ jobs:
4545
LABEL: prerelease
4646

4747
- name: Create pre release tag
48-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # tag v2.3.3
48+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # tag v2.4.1
4949
with:
5050
tag_name: ${{ env.prerelease_tag }}
5151
name: ${{ env.prerelease_tag }}

0 commit comments

Comments
 (0)