Skip to content

Commit 49e85e4

Browse files
TonyCTHsuTonyCTHsu
committed
Don't use container
1 parent 91899a3 commit 49e85e4

File tree

2 files changed

+73
-58
lines changed

2 files changed

+73
-58
lines changed

‎.github/workflows/test.yml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
batch-ruby-34:
1919
runs-on: ubuntu-24.04
20-
name: Batch (ruby-3.4)
20+
name: batch (ruby-3.4)
2121
outputs:
2222
batches: "${{ steps.set-batches.outputs.batches }}"
2323
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -53,7 +53,7 @@ jobs:
5353
needs:
5454
- batch-ruby-34
5555
runs-on: ubuntu-24.04
56-
name: Build & Test (ruby-3.4) [${{ matrix.batch }}]
56+
name: build & test (ruby-3.4) [${{ matrix.batch }}]
5757
env:
5858
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
5959
strategy:
@@ -152,7 +152,7 @@ jobs:
152152
path: tmp/rspec/*.xml
153153
batch-ruby-33:
154154
runs-on: ubuntu-24.04
155-
name: Batch (ruby-3.3)
155+
name: batch (ruby-3.3)
156156
outputs:
157157
batches: "${{ steps.set-batches.outputs.batches }}"
158158
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -188,7 +188,7 @@ jobs:
188188
needs:
189189
- batch-ruby-33
190190
runs-on: ubuntu-24.04
191-
name: Build & Test (ruby-3.3) [${{ matrix.batch }}]
191+
name: build & test (ruby-3.3) [${{ matrix.batch }}]
192192
env:
193193
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
194194
strategy:
@@ -287,7 +287,7 @@ jobs:
287287
path: tmp/rspec/*.xml
288288
batch-ruby-32:
289289
runs-on: ubuntu-24.04
290-
name: Batch (ruby-3.2)
290+
name: batch (ruby-3.2)
291291
outputs:
292292
batches: "${{ steps.set-batches.outputs.batches }}"
293293
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -323,7 +323,7 @@ jobs:
323323
needs:
324324
- batch-ruby-32
325325
runs-on: ubuntu-24.04
326-
name: Build & Test (ruby-3.2) [${{ matrix.batch }}]
326+
name: build & test (ruby-3.2) [${{ matrix.batch }}]
327327
env:
328328
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
329329
strategy:
@@ -422,7 +422,7 @@ jobs:
422422
path: tmp/rspec/*.xml
423423
batch-ruby-31:
424424
runs-on: ubuntu-24.04
425-
name: Batch (ruby-3.1)
425+
name: batch (ruby-3.1)
426426
outputs:
427427
batches: "${{ steps.set-batches.outputs.batches }}"
428428
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -458,7 +458,7 @@ jobs:
458458
needs:
459459
- batch-ruby-31
460460
runs-on: ubuntu-24.04
461-
name: Build & Test (ruby-3.1) [${{ matrix.batch }}]
461+
name: build & test (ruby-3.1) [${{ matrix.batch }}]
462462
env:
463463
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
464464
strategy:
@@ -557,7 +557,7 @@ jobs:
557557
path: tmp/rspec/*.xml
558558
batch-ruby-30:
559559
runs-on: ubuntu-24.04
560-
name: Batch (ruby-3.0)
560+
name: batch (ruby-3.0)
561561
outputs:
562562
batches: "${{ steps.set-batches.outputs.batches }}"
563563
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -593,7 +593,7 @@ jobs:
593593
needs:
594594
- batch-ruby-30
595595
runs-on: ubuntu-24.04
596-
name: Build & Test (ruby-3.0) [${{ matrix.batch }}]
596+
name: build & test (ruby-3.0) [${{ matrix.batch }}]
597597
env:
598598
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
599599
strategy:
@@ -692,7 +692,7 @@ jobs:
692692
path: tmp/rspec/*.xml
693693
batch-ruby-27:
694694
runs-on: ubuntu-24.04
695-
name: Batch (ruby-2.7)
695+
name: batch (ruby-2.7)
696696
outputs:
697697
batches: "${{ steps.set-batches.outputs.batches }}"
698698
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -728,7 +728,7 @@ jobs:
728728
needs:
729729
- batch-ruby-27
730730
runs-on: ubuntu-24.04
731-
name: Build & Test (ruby-2.7) [${{ matrix.batch }}]
731+
name: build & test (ruby-2.7) [${{ matrix.batch }}]
732732
env:
733733
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
734734
strategy:
@@ -827,7 +827,7 @@ jobs:
827827
path: tmp/rspec/*.xml
828828
batch-ruby-26:
829829
runs-on: ubuntu-24.04
830-
name: Batch (ruby-2.6)
830+
name: batch (ruby-2.6)
831831
outputs:
832832
batches: "${{ steps.set-batches.outputs.batches }}"
833833
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -863,7 +863,7 @@ jobs:
863863
needs:
864864
- batch-ruby-26
865865
runs-on: ubuntu-24.04
866-
name: Build & Test (ruby-2.6) [${{ matrix.batch }}]
866+
name: build & test (ruby-2.6) [${{ matrix.batch }}]
867867
env:
868868
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
869869
strategy:
@@ -962,7 +962,7 @@ jobs:
962962
path: tmp/rspec/*.xml
963963
batch-ruby-25:
964964
runs-on: ubuntu-24.04
965-
name: Batch (ruby-2.5)
965+
name: batch (ruby-2.5)
966966
outputs:
967967
batches: "${{ steps.set-batches.outputs.batches }}"
968968
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -998,7 +998,7 @@ jobs:
998998
needs:
999999
- batch-ruby-25
10001000
runs-on: ubuntu-24.04
1001-
name: Build & Test (ruby-2.5) [${{ matrix.batch }}]
1001+
name: build & test (ruby-2.5) [${{ matrix.batch }}]
10021002
env:
10031003
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
10041004
strategy:
@@ -1097,7 +1097,7 @@ jobs:
10971097
path: tmp/rspec/*.xml
10981098
batch-jruby-94:
10991099
runs-on: ubuntu-24.04
1100-
name: Batch (jruby-9.4)
1100+
name: batch (jruby-9.4)
11011101
outputs:
11021102
batches: "${{ steps.set-batches.outputs.batches }}"
11031103
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -1133,7 +1133,7 @@ jobs:
11331133
needs:
11341134
- batch-jruby-94
11351135
runs-on: ubuntu-24.04
1136-
name: Build & Test (jruby-9.4) [${{ matrix.batch }}]
1136+
name: build & test (jruby-9.4) [${{ matrix.batch }}]
11371137
env:
11381138
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
11391139
strategy:
@@ -1232,7 +1232,7 @@ jobs:
12321232
path: tmp/rspec/*.xml
12331233
batch-jruby-93:
12341234
runs-on: ubuntu-24.04
1235-
name: Batch (jruby-9.3)
1235+
name: batch (jruby-9.3)
12361236
outputs:
12371237
batches: "${{ steps.set-batches.outputs.batches }}"
12381238
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -1268,7 +1268,7 @@ jobs:
12681268
needs:
12691269
- batch-jruby-93
12701270
runs-on: ubuntu-24.04
1271-
name: Build & Test (jruby-9.3) [${{ matrix.batch }}]
1271+
name: build & test (jruby-9.3) [${{ matrix.batch }}]
12721272
env:
12731273
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
12741274
strategy:
@@ -1367,7 +1367,7 @@ jobs:
13671367
path: tmp/rspec/*.xml
13681368
batch-jruby-92:
13691369
runs-on: ubuntu-24.04
1370-
name: Batch (jruby-9.2)
1370+
name: batch (jruby-9.2)
13711371
outputs:
13721372
batches: "${{ steps.set-batches.outputs.batches }}"
13731373
cache-key: "${{ steps.restore-cache.outputs.cache-primary-key }}"
@@ -1403,7 +1403,7 @@ jobs:
14031403
needs:
14041404
- batch-jruby-92
14051405
runs-on: ubuntu-24.04
1406-
name: Build & Test (jruby-9.2) [${{ matrix.batch }}]
1406+
name: build & test (jruby-9.2) [${{ matrix.batch }}]
14071407
env:
14081408
BATCHED_TASKS: "${{ toJSON(matrix.tasks) }}"
14091409
strategy:
@@ -1501,7 +1501,7 @@ jobs:
15011501
name: junit-jruby-92-${{ matrix.batch }}-${{ github.run_id }}
15021502
path: tmp/rspec/*.xml
15031503
complete:
1504-
name: Complete
1504+
name: complete
15051505
runs-on: ubuntu-24.04
15061506
needs:
15071507
- build-test-ruby-34
@@ -1518,19 +1518,15 @@ jobs:
15181518
steps:
15191519
- run: echo "DONE!"
15201520
upload-junit:
1521-
name: Upload/JUnit reports
1521+
name: upload/junit
15221522
if: "!cancelled()"
15231523
runs-on: ubuntu-24.04
1524-
container:
1525-
image: datadog/ci
1526-
credentials:
1527-
username: "${{ secrets.DOCKERHUB_USERNAME }}"
1528-
password: "${{ secrets.DOCKERHUB_TOKEN }}"
1529-
env:
1530-
DD_APP_KEY: "${{ secrets.DD_APP_KEY }}"
1531-
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
1532-
DD_ENV: ci
1533-
DATADOG_SITE: datadoghq.com
1524+
env:
1525+
DD_APP_KEY: "${{ secrets.DD_APP_KEY }}"
1526+
DD_API_KEY: "${{ secrets.DD_API_KEY }}"
1527+
DD_ENV: ci
1528+
DATADOG_SITE: datadoghq.com
1529+
DD_SERVICE: dd-trace-rb
15341530
needs:
15351531
- build-test-ruby-34
15361532
- build-test-ruby-33
@@ -1544,11 +1540,15 @@ jobs:
15441540
- build-test-jruby-93
15451541
- build-test-jruby-92
15461542
steps:
1547-
- run: mkdir rspec && datadog-ci version
1543+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1544+
- run: |
1545+
curl -L --fail --retry 5 https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci
1546+
chmod +x /usr/local/bin/datadog-ci
1547+
- run: mkdir -p tmp/rspec && datadog-ci version
15481548
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
15491549
with:
1550-
path: rspec
1550+
path: tmp/rspec
15511551
pattern: junit-*
15521552
merge-multiple: true
1553-
- run: sed -i 's;file="./;file=";g' rspec/*.xml
1554-
- run: datadog-ci junit upload --service dd-trace-rb rspec/
1553+
- run: sed -i 's;file="./;file=";g' tmp/rspec/*.xml
1554+
- run: datadog-ci junit upload --verbose --dry-run tmp/rspec/

‎tasks/github.rake‎

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ namespace :github do
100100
runtimes.each do |runtime|
101101
jobs[runtime.batch_id] = {
102102
'runs-on' => ubuntu,
103-
'name' => "Batch (#{runtime.engine}-#{runtime.version})",
103+
'name' => "batch (#{runtime.engine}-#{runtime.version})",
104104
'outputs' => {
105105
'batches' => '${{ steps.set-batches.outputs.batches }}',
106106
'cache-key' => '${{ steps.restore-cache.outputs.cache-primary-key }}'
@@ -154,7 +154,7 @@ namespace :github do
154154
runtime.batch_id,
155155
],
156156
'runs-on' => ubuntu,
157-
'name' => "Build & Test (#{runtime.engine}-#{runtime.version}) [${{ matrix.batch }}]",
157+
'name' => "build & test (#{runtime.engine}-#{runtime.version}) [${{ matrix.batch }}]",
158158
'env' => { 'BATCHED_TASKS' => '${{ toJSON(matrix.tasks) }}' },
159159
'strategy' => {
160160
'fail-fast' => false,
@@ -260,43 +260,58 @@ namespace :github do
260260
},
261261
'jobs' => jobs.merge(
262262
'complete' => {
263-
'name' => 'Complete',
263+
'name' => 'complete',
264264
'runs-on' => ubuntu,
265265
'needs' => runtimes.map(&:build_test_id),
266266
'steps' => [
267267
'run' => 'echo "DONE!"'
268268
]
269269
},
270270
'upload-junit' => {
271-
'name' => 'Upload/JUnit reports',
271+
'name' => 'upload/junit',
272272
'if' => '!cancelled()',
273273
'runs-on' => ubuntu,
274-
'container' => {
275-
'image' => 'datadog/ci',
276-
'credentials' => {
277-
'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
278-
'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
279-
},
280-
'env' => {
281-
'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
282-
'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
283-
'DD_ENV' => 'ci',
284-
'DATADOG_SITE' => 'datadoghq.com'
285-
}
274+
'env' => {
275+
'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
276+
'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
277+
'DD_ENV' => 'ci',
278+
'DATADOG_SITE' => 'datadoghq.com',
279+
'DD_SERVICE' => 'dd-trace-rb',
286280
},
281+
# 'container' => {
282+
# 'image' => 'datadog/ci',
283+
# 'credentials' => {
284+
# 'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
285+
# 'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
286+
# },
287+
# 'env' => {
288+
# 'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
289+
# 'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
290+
# 'DD_ENV' => 'ci',
291+
# 'DATADOG_SITE' => 'datadoghq.com',
292+
# 'DD_SERVICE' => 'dd-trace-rb',
293+
# }
294+
# },
287295
'needs' => runtimes.map(&:build_test_id),
288296
'steps' => [
289-
{ 'run' => 'mkdir rspec && datadog-ci version' },
297+
{ 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' },
298+
{
299+
'run' => <<~BASH
300+
curl -L --fail --retry 5 https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci
301+
chmod +x /usr/local/bin/datadog-ci
302+
BASH
303+
},
304+
{ 'run' => 'mkdir -p tmp/rspec && datadog-ci version' },
290305
{
291306
'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16',
292307
'with' => {
293-
'path' => 'rspec',
308+
'path' => 'tmp/rspec',
294309
'pattern' => 'junit-*',
295310
'merge-multiple' => true
296311
}
297312
},
298-
{ 'run' => "sed -i 's;file=\"\.\/;file=\";g' rspec/*.xml" },
299-
{ 'run' => 'datadog-ci junit upload --service dd-trace-rb rspec/' },
313+
{ 'run' => "sed -i 's;file=\"\.\/;file=\";g' tmp/rspec/*.xml" },
314+
{ 'run' => 'datadog-ci junit upload --verbose --dry-run tmp/rspec/' },
300315
]
301316
}
302317
)

0 commit comments

Comments
 (0)