Skip to content

Commit 06f82df

Browse files
reactive-firewallreactive-firewall
committed
[HOTFIX] Revert use of step secrets in GHA
Changes in file .github/actions/fetch-test-reporter/action.yml: * return secrets to inputs Changes in file .github/actions/purge-test-reporter/action.yml: * return secrets to inputs Changes in file .github/actions/test-reporter-upload/action.yml: * return secrets to inputs Changes in file .github/workflows/Tests.yml: * return secrets to inputs
1 parent 7e57374 commit 06f82df

File tree

4 files changed

+13
-24
lines changed

4 files changed

+13
-24
lines changed

‎.github/actions/fetch-test-reporter/action.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ inputs:
1414
rate limiting.
1515
default: ${{ github.server_url == 'https://github.com' && github.token || '' }}
1616
required: true
17-
secrets:
1817
codeclimate-token:
1918
description: |
2019
The token used to authenticate when performing codeclimate API operations.
@@ -71,10 +70,10 @@ runs:
7170
if: ${{ !cancelled() && (steps.output_can_fetch.outputs.can_fetch == 'true') && (runner.os != 'Windows') && (github.repository == 'reactive-firewall/multicast') }}
7271
shell: bash
7372
env:
74-
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.codeclimate-token || '' }}
75-
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && secrets.cc-test-reporter-id || '' }}
76-
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.coveralls-token || '' }}
77-
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && secrets.deepsource-dsn || '' }}
73+
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.codeclimate-token || '' }}
74+
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && inputs.cc-test-reporter-id || '' }}
75+
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.coveralls-token || '' }}
76+
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && inputs.deepsource-dsn || '' }}
7877
run: |
7978
${{ github.workspace }}/.github/tools/fetch-test-reporter/fetch-test-reporter || exit $?
8079
- name: "Evaluate Fetch Task"

‎.github/actions/purge-test-reporter/action.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ inputs:
1414
rate limiting.
1515
default: ${{ github.server_url == 'https://github.com' && github.token || '' }}
1616
required: true
17-
secrets:
1817
codeclimate-token:
1918
description: |
2019
The token used to authenticate when performing codeclimate API operations.
@@ -71,10 +70,10 @@ runs:
7170
if: ${{ !cancelled() && (steps.output_can_purge.outputs.can_purge == 'true') && (runner.os != 'Windows') && (github.repository == 'reactive-firewall/multicast') }}
7271
shell: bash
7372
env:
74-
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.codeclimate-token || '' }}
75-
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && secrets.cc-test-reporter-id || '' }}
76-
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.coveralls-token || '' }}
77-
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && secrets.deepsource-dsn || '' }}
73+
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.codeclimate-token || '' }}
74+
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && inputs.cc-test-reporter-id || '' }}
75+
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.coveralls-token || '' }}
76+
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && inputs.deepsource-dsn || '' }}
7877
run: |
7978
${{ github.workspace }}/.github/tools/fetch-test-reporter/purge-test-reporter || exit $?
8079
- name: "Evaluate Fetch Task"

‎.github/actions/test-reporter-upload/action.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ inputs:
4040
- Linux
4141
- Windows
4242
required: true
43-
secrets:
4443
codeclimate-token:
4544
description: |
4645
The token used to authenticate when performing codeclimate API operations.
@@ -262,7 +261,7 @@ runs:
262261
if: ${{ success() && (steps.output_can_upload.outputs.can_upload == 'true') && (steps.output_upload_tools.outputs.can_upload_to_codecov == 'true') }}
263262
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
264263
with:
265-
token: ${{ secrets.codecov-token }}
264+
token: ${{ inputs.codecov-token }}
266265
job_code: ${{ inputs.job_code || '' }}
267266
override_commit: ${{ steps.output_sha.outputs.sha }}
268267
files: ./coverage.xml,./test-reports/coverage.xml
@@ -287,8 +286,8 @@ runs:
287286
id: coverage-codeclimate-upload
288287
shell: bash
289288
env:
290-
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.codeclimate-token || '' }}
291-
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && secrets.cc-test-reporter-id || '' }}
289+
CODECLIMATE_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.codeclimate-token || '' }}
290+
CC_TEST_REPORTER_ID: ${{ github.server_url == 'https://github.com' && inputs.cc-test-reporter-id || '' }}
292291
run: |
293292
if [[ "${{ inputs.tests-outcome }}" == "success" ]] ; then
294293
./cc-test-reporter after-build --exit-code 0 || exit 1 ;
@@ -300,7 +299,7 @@ runs:
300299
id: coverage-deepsource-upload
301300
shell: bash
302301
env:
303-
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && secrets.deepsource-dsn || '' }}
302+
DEEPSOURCE_DSN: ${{ github.server_url == 'https://github.com' && inputs.deepsource-dsn || '' }}
304303
DEEPSOURCE_TOOL: ${{ steps.output_upload_tools.outputs.deepsource_executable }}
305304
run: |
306305
${DEEPSOURCE_TOOL} report --analyzer test-coverage --key python --value-file ./coverage.xml 2>/dev/null
@@ -309,7 +308,7 @@ runs:
309308
id: coverage-coveralls-upload
310309
shell: bash
311310
env:
312-
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && secrets.coveralls-token || '' }}
311+
COVERALLS_REPO_TOKEN: ${{ github.server_url == 'https://github.com' && inputs.coveralls-token || '' }}
313312
COVERALLS_TOOL: ${{ steps.output_upload_tools.outputs.coveralls_executable }}
314313
run: |
315314
if [[ "${{ inputs.tests-outcome }}" == "success" ]] ; then

‎.github/workflows/Tests.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ jobs:
203203
uses: ./.github/actions/fetch-test-reporter
204204
with:
205205
token: ${{ github.server_url == 'https://github.com' && github.token || '' }}
206-
secrets:
207206
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
208207
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
209208
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -260,7 +259,6 @@ jobs:
260259
os: ${{ runner.os }}
261260
python-version: ${{ matrix.python-version }}
262261
job_code: ${{ needs.check_mats.outputs.tests_id }}
263-
secrets:
264262
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
265263
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
266264
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -272,7 +270,6 @@ jobs:
272270
uses: ./.github/actions/purge-test-reporter
273271
with:
274272
token: ${{ github.server_url == 'https://github.com' && github.token || '' }}
275-
secrets:
276273
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
277274
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
278275
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -482,7 +479,6 @@ jobs:
482479
uses: ./.github/actions/fetch-test-reporter
483480
with:
484481
token: ${{ github.server_url == 'https://github.com' && github.token || '' }}
485-
secrets:
486482
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
487483
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
488484
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -519,7 +515,6 @@ jobs:
519515
os: ${{ runner.os }}
520516
python-version: ${{ matrix.python-version }}
521517
job_code: ${{ needs.check_mats.outputs.tests_id }}
522-
secrets:
523518
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
524519
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
525520
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -531,7 +526,6 @@ jobs:
531526
uses: ./.github/actions/purge-test-reporter
532527
with:
533528
token: ${{ github.server_url == 'https://github.com' && github.token || '' }}
534-
secrets:
535529
deepsource-dsn: ${{ github.server_url == 'https://github.com' && secrets.DEEPSOURCE_DSN || '' }}
536530
coveralls-token: ${{ github.server_url == 'https://github.com' && secrets.COVERALLS_REPO_TOKEN || '' }}
537531
codeclimate-token: ${{ github.server_url == 'https://github.com' && secrets.CODECLIMATE_REPO_TOKEN || '' }}
@@ -839,8 +833,6 @@ jobs:
839833
BRANCH_NAME: ${{ needs.check_mats.outputs.mats_ref_name }}
840834
VCS_BRANCH_NAME: ${{ needs.check_mats.outputs.build_ref_name }}
841835
VCS_COMMIT_ID: ${{ needs.check_mats.outputs.build_sha }}
842-
CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_REPO_TOKEN }}
843-
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
844836
outputs:
845837
integration_outcome: ${{ steps.integration_outcome.outcome }}
846838
integration_test_outcome: ${{ steps.integration_tests.outputs.integration_test_outcome }}

0 commit comments

Comments
 (0)