Skip to content

Commit 20db09d

Browse files
authored
chore(ci): Fix the email report (#98)
Thanks to Kou for providing an smtp server we can use!
1 parent 73c18af commit 20db09d

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

.github/workflows/nightly_packaging_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
date: '${{ inputs.date }}'
2020
secrets:
2121
CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
22-
CROSSBOW_SMTP_USER: ${{ secrets.CROSSBOW_SMTP_USER }}
2322
CROSSBOW_SMTP_PASSWORD: ${{ secrets.CROSSBOW_SMTP_PASSWORD }}
2423
CROSSBOW_ZULIP_WEBHOOK: ${{ secrets.CROSSBOW_ZULIP_WEBHOOK }}
2524
CROSSBOW_SLACK_WEBHOOK: ${{ secrets.CROSSBOW_SLACK_WEBHOOK }}

.github/workflows/nightly_release_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
date: '${{ inputs.date }}'
2020
secrets:
2121
CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
22-
CROSSBOW_SMTP_USER: ${{ secrets.CROSSBOW_SMTP_USER }}
2322
CROSSBOW_SMTP_PASSWORD: ${{ secrets.CROSSBOW_SMTP_PASSWORD }}
2423
CROSSBOW_ZULIP_WEBHOOK: ${{ secrets.CROSSBOW_ZULIP_WEBHOOK }}
2524
CROSSBOW_SLACK_WEBHOOK: ${{ secrets.CROSSBOW_SLACK_WEBHOOK }}

.github/workflows/nightly_tests_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
date: '${{ inputs.date }}'
2020
secrets:
2121
CROSSBOW_GITHUB_TOKEN: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
22-
CROSSBOW_SMTP_USER: ${{ secrets.CROSSBOW_SMTP_USER }}
2322
CROSSBOW_SMTP_PASSWORD: ${{ secrets.CROSSBOW_SMTP_PASSWORD }}
2423
CROSSBOW_ZULIP_WEBHOOK: ${{ secrets.CROSSBOW_ZULIP_WEBHOOK }}
2524
CROSSBOW_SLACK_WEBHOOK: ${{ secrets.CROSSBOW_SLACK_WEBHOOK }}

.github/workflows/report.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ on:
1313
secrets:
1414
CROSSBOW_GITHUB_TOKEN:
1515
required: true
16-
CROSSBOW_SMTP_USER:
17-
required: true
1816
CROSSBOW_SMTP_PASSWORD:
1917
required: true
2018
CROSSBOW_ZULIP_WEBHOOK:
@@ -66,10 +64,11 @@ jobs:
6664
set +e
6765
archery crossbow report \
6866
--send \
67+
--smtp-server 'commit-email.info' \
6968
--sender-name Crossbow \
70-
--sender-email 'crossbow@ursacomputing.com' \
69+
--sender-email 'crossbow@commit-email.info' \
7170
--recipient-email '[email protected]' \
72-
--smtp-user ${{ secrets.CROSSBOW_SMTP_USER }} \
71+
--smtp-user crossbow \
7372
--smtp-password ${{ secrets.CROSSBOW_SMTP_PASSWORD }} \
7473
${job_id}
7574
email_exit_code=$?

.github/workflows/token_expiration.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ on:
88
required: true
99
default: '30'
1010
type: string
11-
1211
schedule:
1312
# Mondays
1413
- cron: '0 0 * * 1'
1514

15+
permissions:
16+
contents: read
17+
1618
jobs:
1719
token-expiration-check:
1820
name: Validate token expiration date
@@ -24,8 +26,6 @@ jobs:
2426
- name: Checkout Crossbow
2527
uses: actions/checkout@v3
2628
with:
27-
# If we use github.token then the push will not trigger CI
28-
token: ${{ secrets.CROSSBOW_GITHUB_TOKEN }}
2929
path: crossbow
3030
fetch-depth: 0
3131
- uses: actions/setup-python@v4
@@ -42,9 +42,10 @@ jobs:
4242
echo "Checking whether to notify on token expiration date"
4343
archery crossbow notify-token-expiration \
4444
--send \
45+
--smtp-server 'commit-email.info' \
4546
--sender-name Crossbow \
46-
--sender-email 'crossbow@ursacomputing.com' \
47+
--sender-email 'crossbow@commit-email.info' \
4748
--recipient-email '[email protected]' \
48-
--smtp-user ${{ secrets.CROSSBOW_SMTP_USER }} \
49+
--smtp-user crossbow \
4950
--smtp-password ${{ secrets.CROSSBOW_SMTP_PASSWORD }} \
5051
--days ${{ inputs.days || '30'}}

0 commit comments

Comments
 (0)