Skip to content

Commit b2b19b3

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into celery-custom-task-instrumentation
2 parents 01b56fb + 02d0071 commit b2b19b3

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

‎.github/workflows/tests.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
170170
env:
171171
TOX_PARALLEL_NO_SPINNER: 1
172-
PY_COLORS: 0
172+
FORCE_COLOR: "true"
173173

174174
- name: Upload Coverage Artifacts
175175
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -220,7 +220,7 @@ jobs:
220220
tox -vv -e ${{ steps.get-envs.outputs.envs }}
221221
env:
222222
TOX_PARALLEL_NO_SPINNER: 1
223-
PY_COLORS: 0
223+
FORCE_COLOR: "true"
224224

225225
- name: Upload Coverage Artifacts
226226
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -285,7 +285,7 @@ jobs:
285285
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
286286
env:
287287
TOX_PARALLEL_NO_SPINNER: 1
288-
PY_COLORS: 0
288+
FORCE_COLOR: "true"
289289

290290
- name: Upload Coverage Artifacts
291291
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -351,7 +351,7 @@ jobs:
351351
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
352352
env:
353353
TOX_PARALLEL_NO_SPINNER: 1
354-
PY_COLORS: 0
354+
FORCE_COLOR: "true"
355355

356356
- name: Upload Coverage Artifacts
357357
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -417,7 +417,7 @@ jobs:
417417
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
418418
env:
419419
TOX_PARALLEL_NO_SPINNER: 1
420-
PY_COLORS: 0
420+
FORCE_COLOR: "true"
421421

422422
- name: Upload Coverage Artifacts
423423
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -486,7 +486,7 @@ jobs:
486486
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
487487
env:
488488
TOX_PARALLEL_NO_SPINNER: 1
489-
PY_COLORS: 0
489+
FORCE_COLOR: "true"
490490

491491
- name: Upload Coverage Artifacts
492492
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -555,7 +555,7 @@ jobs:
555555
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
556556
env:
557557
TOX_PARALLEL_NO_SPINNER: 1
558-
PY_COLORS: 0
558+
FORCE_COLOR: "true"
559559

560560
- name: Upload Coverage Artifacts
561561
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -660,7 +660,7 @@ jobs:
660660
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
661661
env:
662662
TOX_PARALLEL_NO_SPINNER: 1
663-
PY_COLORS: 0
663+
FORCE_COLOR: "true"
664664

665665
- name: Upload Coverage Artifacts
666666
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -724,7 +724,7 @@ jobs:
724724
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
725725
env:
726726
TOX_PARALLEL_NO_SPINNER: 1
727-
PY_COLORS: 0
727+
FORCE_COLOR: "true"
728728

729729
- name: Upload Coverage Artifacts
730730
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -790,7 +790,7 @@ jobs:
790790
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
791791
env:
792792
TOX_PARALLEL_NO_SPINNER: 1
793-
PY_COLORS: 0
793+
FORCE_COLOR: "true"
794794

795795
- name: Upload Coverage Artifacts
796796
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -857,7 +857,7 @@ jobs:
857857
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
858858
env:
859859
TOX_PARALLEL_NO_SPINNER: 1
860-
PY_COLORS: 0
860+
FORCE_COLOR: "true"
861861

862862
- name: Upload Coverage Artifacts
863863
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -921,7 +921,7 @@ jobs:
921921
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
922922
env:
923923
TOX_PARALLEL_NO_SPINNER: 1
924-
PY_COLORS: 0
924+
FORCE_COLOR: "true"
925925

926926
- name: Upload Coverage Artifacts
927927
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -986,7 +986,7 @@ jobs:
986986
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
987987
env:
988988
TOX_PARALLEL_NO_SPINNER: 1
989-
PY_COLORS: 0
989+
FORCE_COLOR: "true"
990990

991991
- name: Upload Coverage Artifacts
992992
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1062,7 +1062,7 @@ jobs:
10621062
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
10631063
env:
10641064
TOX_PARALLEL_NO_SPINNER: 1
1065-
PY_COLORS: 0
1065+
FORCE_COLOR: "true"
10661066

10671067
- name: Upload Coverage Artifacts
10681068
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1126,7 +1126,7 @@ jobs:
11261126
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
11271127
env:
11281128
TOX_PARALLEL_NO_SPINNER: 1
1129-
PY_COLORS: 0
1129+
FORCE_COLOR: "true"
11301130

11311131
- name: Upload Coverage Artifacts
11321132
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1190,7 +1190,7 @@ jobs:
11901190
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
11911191
env:
11921192
TOX_PARALLEL_NO_SPINNER: 1
1193-
PY_COLORS: 0
1193+
FORCE_COLOR: "true"
11941194

11951195
- name: Upload Coverage Artifacts
11961196
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1259,7 +1259,7 @@ jobs:
12591259
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
12601260
env:
12611261
TOX_PARALLEL_NO_SPINNER: 1
1262-
PY_COLORS: 0
1262+
FORCE_COLOR: "true"
12631263

12641264
- name: Upload Coverage Artifacts
12651265
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1325,7 +1325,7 @@ jobs:
13251325
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
13261326
env:
13271327
TOX_PARALLEL_NO_SPINNER: 1
1328-
PY_COLORS: 0
1328+
FORCE_COLOR: "true"
13291329

13301330
- name: Upload Coverage Artifacts
13311331
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1392,7 +1392,7 @@ jobs:
13921392
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
13931393
env:
13941394
TOX_PARALLEL_NO_SPINNER: 1
1395-
PY_COLORS: 0
1395+
FORCE_COLOR: "true"
13961396

13971397
- name: Upload Coverage Artifacts
13981398
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1463,7 +1463,7 @@ jobs:
14631463
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
14641464
env:
14651465
TOX_PARALLEL_NO_SPINNER: 1
1466-
PY_COLORS: 0
1466+
FORCE_COLOR: "true"
14671467

14681468
- name: Upload Coverage Artifacts
14691469
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -1527,7 +1527,7 @@ jobs:
15271527
tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
15281528
env:
15291529
TOX_PARALLEL_NO_SPINNER: 1
1530-
PY_COLORS: 0
1530+
FORCE_COLOR: "true"
15311531

15321532
- name: Upload Coverage Artifacts
15331533
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2

‎tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ passenv =
461461
NEW_RELIC_LICENSE_KEY
462462
NEW_RELIC_HOST
463463
GITHUB_ACTIONS
464+
FORCE_COLOR
464465

465466
commands =
466467
framework_grpc: python -m grpc_tools.protoc \

0 commit comments

Comments
 (0)