Skip to content

Commit d242e67

Browse files
committed
dataconnect.yml: code cleanup to match dataconnect_demo_app.yml
1 parent 5713afb commit d242e67

File tree

1 file changed

+36
-30
lines changed

1 file changed

+36
-30
lines changed

.github/workflows/dataconnect.yml

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ jobs:
328328
run: pyright --warnings --stats
329329

330330
send-notifications:
331-
needs:
331+
needs:
332332
- 'integration-test'
333333
- 'actionlint-dataconnect-yml'
334334
- 'python-ci-unit-tests'
@@ -349,48 +349,54 @@ jobs:
349349
with:
350350
python-version: ${{ env.FDC_PYTHON_VERSION }}
351351

352-
- run: pip install -r firebase-dataconnect/ci/requirements.txt
352+
- run: pip install -r requirements.txt
353+
working-directory: firebase-dataconnect/ci
353354

354355
- id: issue-id
355356
name: Determine GitHub Issue For Commenting
357+
working-directory: firebase-dataconnect/ci
356358
env:
357359
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
358360
run: |
359-
set -euo pipefail
360-
set -xv
361-
362-
python \
363-
firebase-dataconnect/ci/calculate_github_issue_for_commenting.py \
364-
--output-file=github_issue_number.txt \
365-
--github-repository='${{ github.repository }}' \
366-
--github-ref='${{ github.ref }}' \
367-
--github-event-name='${{ github.event_name }}' \
368-
--pr-body-github-issue-key=trksmnkncd_notification_issue \
361+
args=(
362+
python
363+
calculate_github_issue_for_commenting.py
364+
--output-file=github_issue_number.txt
365+
--github-repository='${{ github.repository }}'
366+
--github-ref='${{ github.ref }}'
367+
--github-event-name='${{ github.event_name }}'
368+
--pr-body-github-issue-key=trksmnkncd_notification_issue
369369
--github-issue-for-scheduled-run=6857 # https://github.com/firebase/firebase-android-sdk/issues/6857
370+
)
371+
echo "${args[*]}"
372+
"${args[@]}"
370373
374+
set -xv
371375
issue="$(cat github_issue_number.txt)"
372376
echo "issue=$issue" >> "$GITHUB_OUTPUT"
373377
374378
- name: Post Comment on GitHub Issue
375379
if: steps.issue-id.outputs.issue != ''
380+
working-directory: firebase-dataconnect/ci
376381
env:
377382
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
378383
run: |
379-
set -euo pipefail
380-
set -xv
381-
382-
exec python \
383-
firebase-dataconnect/ci/post_comment_for_job_results.py \
384-
--github-issue='${{ steps.issue-id.outputs.issue }}' \
385-
--github-repository='${{ github.repository }}' \
386-
--github-sha='${{ github.sha }}' \
387-
--github-repository-html-url='${{ github.event.repository.html_url }}' \
388-
--github-run-id='${{ github.run_id }}' \
389-
--github-run-number='${{ github.run_number }}' \
390-
--github-run-attempt='${{ github.run_attempt }}' \
391-
'integration-test:${{ needs.integration-test.result }}' \
392-
'actionlint-dataconnect-yml:${{ needs.actionlint-dataconnect-yml.result }}' \
393-
'python-ci-unit-tests:${{ needs.python-ci-unit-tests.result }}' \
394-
'python-ci-lint:${{ needs.python-ci-lint.result }}' \
395-
'python-ci-format:${{ needs.python-ci-format.result }}' \
396-
'python-ci-type-check:${{ needs.python-ci-type-check.result }}' \
384+
args=(
385+
python
386+
post_comment_for_job_results.py
387+
--github-issue='${{ steps.issue-id.outputs.issue }}'
388+
--github-repository='${{ github.repository }}'
389+
--github-sha='${{ github.sha }}'
390+
--github-repository-html-url='${{ github.event.repository.html_url }}'
391+
--github-run-id='${{ github.run_id }}'
392+
--github-run-number='${{ github.run_number }}'
393+
--github-run-attempt='${{ github.run_attempt }}'
394+
'integration-test:${{ needs.integration-test.result }}'
395+
'actionlint-dataconnect-yml:${{ needs.actionlint-dataconnect-yml.result }}'
396+
'python-ci-unit-tests:${{ needs.python-ci-unit-tests.result }}'
397+
'python-ci-lint:${{ needs.python-ci-lint.result }}'
398+
'python-ci-format:${{ needs.python-ci-format.result }}'
399+
'python-ci-type-check:${{ needs.python-ci-type-check.result }}'
400+
)
401+
echo "${args[*]}"
402+
exec "${args[@]}"

0 commit comments

Comments
 (0)