@@ -289,36 +289,22 @@ namespace :github do
289
289
'name' => 'upload/junit' ,
290
290
'if' => '!cancelled()' ,
291
291
'runs-on' => ubuntu ,
292
- 'env' => {
293
- 'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}' ,
294
- 'DD_API_KEY' => '${{ secrets.DD_API_KEY }}' ,
295
- 'DD_ENV' => 'ci' ,
296
- 'DATADOG_SITE' => 'datadoghq.com' ,
297
- 'DD_SERVICE' => 'dd-trace-rb' ,
292
+ 'container' => {
293
+ 'image' => 'datadog/ci' ,
294
+ 'credentials' => {
295
+ 'username' => '${{ secrets.DOCKERHUB_USERNAME }}' ,
296
+ 'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
297
+ } ,
298
+ 'env' => {
299
+ 'DD_API_KEY' => '${{ secrets.DD_API_KEY }}' ,
300
+ 'DD_ENV' => 'ci' ,
301
+ 'DATADOG_SITE' => 'datadoghq.com' ,
302
+ 'DD_SERVICE' => 'dd-trace-rb' ,
303
+ 'DD_GIT_REPOSITORY_URL' => '${{ github.repositoryUrl }}' ,
304
+ }
298
305
} ,
299
- # 'container' => {
300
- # 'image' => 'datadog/ci',
301
- # 'credentials' => {
302
- # 'username' => '${{ secrets.DOCKERHUB_USERNAME }}',
303
- # 'password' => '${{ secrets.DOCKERHUB_TOKEN }}'
304
- # },
305
- # 'env' => {
306
- # 'DD_APP_KEY' => '${{ secrets.DD_APP_KEY }}',
307
- # 'DD_API_KEY' => '${{ secrets.DD_API_KEY }}',
308
- # 'DD_ENV' => 'ci',
309
- # 'DATADOG_SITE' => 'datadoghq.com',
310
- # 'DD_SERVICE' => 'dd-trace-rb',
311
- # }
312
- # },
313
306
'needs' => runtimes . map ( &:build_test_id ) ,
314
307
'steps' => [
315
- { 'uses' => 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' } ,
316
- {
317
- 'run' => <<~BASH
318
- curl -L --fail --retry 5 https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci
319
- chmod +x /usr/local/bin/datadog-ci
320
- BASH
321
- } ,
322
308
{ 'run' => 'mkdir -p tmp/rspec && datadog-ci version' } ,
323
309
{
324
310
'uses' => 'actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16' ,
@@ -329,7 +315,16 @@ namespace :github do
329
315
}
330
316
} ,
331
317
{ 'run' => "sed -i 's;file=\" \. \/ ;file=\" ;g' tmp/rspec/*.xml" } ,
332
- { 'run' => 'datadog-ci junit upload --verbose --dry-run tmp/rspec/' } ,
318
+ {
319
+ 'if' => "github.event_name == 'pull_request'" ,
320
+ 'run' => 'echo "DD_GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV'
321
+ } ,
322
+ {
323
+ 'if' => "github.event_name != 'pull_request'" ,
324
+ 'run' => 'echo "DD_GIT_COMMIT_SHA=${{ github.sha }}" >> $GITHUB_ENV'
325
+ } ,
326
+ { 'run' => 'echo $DD_GIT_COMMIT_SHA' } ,
327
+ { 'run' => 'datadog-ci junit upload --verbose tmp/rspec/' } ,
333
328
]
334
329
} ,
335
330
'coverage' => {
0 commit comments