Skip to content

Commit 91899a3

Browse files
TonyCTHsuTonyCTHsu
committed
Pin sha
1 parent d4b2604 commit 91899a3

File tree

3 files changed

+47
-23
lines changed

3 files changed

+47
-23
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,16 +277,16 @@ orbs:
277277
when: always
278278
command: |
279279
set -e
280-
280+
281281
sed -i 's/file="\.\//file="/g' tmp/rspec/*.xml
282-
282+
283283
ls -l tmp/rspec/*.xml
284284
285285
curl -L --fail --retry 5 "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64" --output "/usr/local/bin/datadog-ci" && chmod +x /usr/local/bin/datadog-ci
286286
287287
datadog-ci version
288288
289-
DD_ENV=ci DATADOG_API_KEY=$JUNIT_UPLOAD_API_KEY DATADOG_SITE=datadoghq.com datadog-ci junit upload --service dd-trace-rb tmp/rspec/
289+
DD_ENV=ci DATADOG_API_KEY=$JUNIT_UPLOAD_API_KEY DATADOG_SITE=datadoghq.com datadog-ci junit upload --dry-run --verbose --service dd-trace-rb tmp/rspec/
290290
- store_test_results:
291291
path: tmp/rspec
292292
- persist_to_workspace:

‎.github/workflows/test.yml‎

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ name: Unit Tests
66
push:
77
branches:
88
- master
9-
- tonycthsu/*
109
pull_request:
1110
branches:
1211
- master
@@ -146,7 +145,8 @@ jobs:
146145
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
147146
with:
148147
limit-access-to-actor: true
149-
- uses: actions/upload-artifact@v4
148+
- if: always()
149+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
150150
with:
151151
name: junit-ruby-34-${{ matrix.batch }}-${{ github.run_id }}
152152
path: tmp/rspec/*.xml
@@ -280,7 +280,8 @@ jobs:
280280
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
281281
with:
282282
limit-access-to-actor: true
283-
- uses: actions/upload-artifact@v4
283+
- if: always()
284+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
284285
with:
285286
name: junit-ruby-33-${{ matrix.batch }}-${{ github.run_id }}
286287
path: tmp/rspec/*.xml
@@ -414,7 +415,8 @@ jobs:
414415
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
415416
with:
416417
limit-access-to-actor: true
417-
- uses: actions/upload-artifact@v4
418+
- if: always()
419+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
418420
with:
419421
name: junit-ruby-32-${{ matrix.batch }}-${{ github.run_id }}
420422
path: tmp/rspec/*.xml
@@ -548,7 +550,8 @@ jobs:
548550
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
549551
with:
550552
limit-access-to-actor: true
551-
- uses: actions/upload-artifact@v4
553+
- if: always()
554+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
552555
with:
553556
name: junit-ruby-31-${{ matrix.batch }}-${{ github.run_id }}
554557
path: tmp/rspec/*.xml
@@ -682,7 +685,8 @@ jobs:
682685
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
683686
with:
684687
limit-access-to-actor: true
685-
- uses: actions/upload-artifact@v4
688+
- if: always()
689+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
686690
with:
687691
name: junit-ruby-30-${{ matrix.batch }}-${{ github.run_id }}
688692
path: tmp/rspec/*.xml
@@ -816,7 +820,8 @@ jobs:
816820
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
817821
with:
818822
limit-access-to-actor: true
819-
- uses: actions/upload-artifact@v4
823+
- if: always()
824+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
820825
with:
821826
name: junit-ruby-27-${{ matrix.batch }}-${{ github.run_id }}
822827
path: tmp/rspec/*.xml
@@ -950,7 +955,8 @@ jobs:
950955
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
951956
with:
952957
limit-access-to-actor: true
953-
- uses: actions/upload-artifact@v4
958+
- if: always()
959+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
954960
with:
955961
name: junit-ruby-26-${{ matrix.batch }}-${{ github.run_id }}
956962
path: tmp/rspec/*.xml
@@ -1084,7 +1090,8 @@ jobs:
10841090
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
10851091
with:
10861092
limit-access-to-actor: true
1087-
- uses: actions/upload-artifact@v4
1093+
- if: always()
1094+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
10881095
with:
10891096
name: junit-ruby-25-${{ matrix.batch }}-${{ github.run_id }}
10901097
path: tmp/rspec/*.xml
@@ -1218,7 +1225,8 @@ jobs:
12181225
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
12191226
with:
12201227
limit-access-to-actor: true
1221-
- uses: actions/upload-artifact@v4
1228+
- if: always()
1229+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
12221230
with:
12231231
name: junit-jruby-94-${{ matrix.batch }}-${{ github.run_id }}
12241232
path: tmp/rspec/*.xml
@@ -1352,7 +1360,8 @@ jobs:
13521360
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
13531361
with:
13541362
limit-access-to-actor: true
1355-
- uses: actions/upload-artifact@v4
1363+
- if: always()
1364+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
13561365
with:
13571366
name: junit-jruby-93-${{ matrix.batch }}-${{ github.run_id }}
13581367
path: tmp/rspec/*.xml
@@ -1486,11 +1495,13 @@ jobs:
14861495
uses: mxschmitt/action-tmate@e5c7151931ca95bad1c6f4190c730ecf8c7dde48
14871496
with:
14881497
limit-access-to-actor: true
1489-
- uses: actions/upload-artifact@v4
1498+
- if: always()
1499+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
14901500
with:
14911501
name: junit-jruby-92-${{ matrix.batch }}-${{ github.run_id }}
14921502
path: tmp/rspec/*.xml
1493-
unit-tests:
1503+
complete:
1504+
name: Complete
14941505
runs-on: ubuntu-24.04
14951506
needs:
14961507
- build-test-ruby-34
@@ -1507,9 +1518,14 @@ jobs:
15071518
steps:
15081519
- run: echo "DONE!"
15091520
upload-junit:
1521+
name: Upload/JUnit reports
1522+
if: "!cancelled()"
15101523
runs-on: ubuntu-24.04
15111524
container:
15121525
image: datadog/ci
1526+
credentials:
1527+
username: "${{ secrets.DOCKERHUB_USERNAME }}"
1528+
password: "${{ secrets.DOCKERHUB_TOKEN }}"
15131529
env:
15141530
DD_APP_KEY: "${{ secrets.DD_APP_KEY }}"
15151531
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
@@ -1529,10 +1545,10 @@ jobs:
15291545
- build-test-jruby-92
15301546
steps:
15311547
- run: mkdir rspec && datadog-ci version
1532-
- uses: actions/download-artifact@v4
1548+
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
15331549
with:
15341550
path: rspec
15351551
pattern: junit-*
15361552
merge-multiple: true
1537-
- run: sed -i 's/file="\.\/"/file="/g' rspec/*.xml
1553+
- run: sed -i 's;file="./;file=";g' rspec/*.xml
15381554
- run: datadog-ci junit upload --service dd-trace-rb rspec/

‎tasks/github.rake‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ namespace :github do
226226
}
227227
},
228228
{
229-
'uses' => 'actions/upload-artifact@v4',
229+
'if' => 'always()',
230+
'uses' => 'actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08',
230231
'with' => {
231232
'name' => runtime.junit_artifact,
232233
'path' => 'tmp/rspec/*.xml'
@@ -242,7 +243,6 @@ namespace :github do
242243
'push' => {
243244
'branches' => [
244245
'master',
245-
'tonycthsu/*'
246246
]
247247
},
248248
'pull_request' => {
@@ -259,17 +259,24 @@ namespace :github do
259259
'cancel-in-progress' => '${{ github.ref != \'refs/heads/master\' }}'
260260
},
261261
'jobs' => jobs.merge(
262-
'unit-tests' => {
262+
'complete' => {
263+
'name' => 'Complete',
263264
'runs-on' => ubuntu,
264265
'needs' => runtimes.map(&:build_test_id),
265266
'steps' => [
266267
'run' => 'echo "DONE!"'
267268
]
268269
},
269270
'upload-junit' => {
271+
'name' => 'Upload/JUnit reports',
272+
'if' => '!cancelled()',
270273
'runs-on' => ubuntu,
271274
'container' => {
272275
'image' => 'datadog/ci',
276+
'credentials' => {
277+
'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
278+
'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
279+
},
273280
'env' => {
274281
'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
275282
'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
@@ -281,13 +288,14 @@ namespace :github do
281288
'steps' => [
282289
{ 'run' => 'mkdir rspec && datadog-ci version' },
283290
{
284-
'uses' => 'actions/download-artifact@v4',
291+
'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16',
285292
'with' => {
293+
'path' => 'rspec',
286294
'pattern' => 'junit-*',
287295
'merge-multiple' => true
288296
}
289297
},
290-
{ 'run' => "sed -i 's/file=\"\.\//file=\"/g' rspec/*.xml" },
298+
{ 'run' => "sed -i 's;file=\"\.\/;file=\";g' rspec/*.xml" },
291299
{ 'run' => 'datadog-ci junit upload --service dd-trace-rb rspec/' },
292300
]
293301
}

0 commit comments

Comments
 (0)