Skip to content

Commit 146bf8d

Browse files
dschodscho
committed
Use more generic names for the -token steps
With my current push to let GitGitGadget work for other projects than Git, it is no longer appropriate to refer to the `git` repository forks directly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 542bda4 commit 146bf8d

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎.github/workflows/handle-new-mails.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414

1515
steps:
1616
- uses: actions/create-github-app-token@v1
17-
id: gitgitgadget-git-token
17+
id: pr-repo-token
1818
with:
1919
app-id: ${{ secrets.GITGITGADGET_GITHUB_APP_ID }}
2020
private-key: ${{ secrets.GITGITGADGET_GITHUB_APP_PRIVATE_KEY }}
2121
owner: gitgitgadget
2222
repositories: git
2323
- uses: actions/create-github-app-token@v1
24-
id: git-git-token
24+
id: upstream-repo-token
2525
with:
2626
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
2727
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
2828
owner: git
2929
repositories: git
3030
- uses: actions/create-github-app-token@v1
31-
id: dscho-git-token
31+
id: test-repo-token
3232
with:
3333
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
3434
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
@@ -37,6 +37,6 @@ jobs:
3737
- uses: gitgitgadget/gitgitgadget/handle-new-mails@v1
3838
with:
3939
config: ${{ vars.CONFIG }}
40-
pr-repo-token: ${{ steps.gitgitgadget-git-token.outputs.token }}
41-
upstream-repo-token: ${{ steps.git-git-token.outputs.token }}
42-
test-repo-token: ${{ steps.dscho-git-token.outputs.token }}
40+
pr-repo-token: ${{ steps.pr-repo-token.outputs.token }}
41+
upstream-repo-token: ${{ steps.upstream-repo-token.outputs.token }}
42+
test-repo-token: ${{ steps.test-repo-token.outputs.token }}

‎.github/workflows/handle-pr-comment.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ jobs:
2323

2424
steps:
2525
- uses: actions/create-github-app-token@v1
26-
id: gitgitgadget-git-token
26+
id: pr-repo-token
2727
with:
2828
app-id: ${{ secrets.GITGITGADGET_GITHUB_APP_ID }}
2929
private-key: ${{ secrets.GITGITGADGET_GITHUB_APP_PRIVATE_KEY }}
3030
owner: gitgitgadget
3131
repositories: git
3232
- uses: actions/create-github-app-token@v1
33-
id: git-git-token
33+
id: upstream-repo-token
3434
with:
3535
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
3636
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
3737
owner: git
3838
repositories: git
3939
- uses: actions/create-github-app-token@v1
40-
id: dscho-git-token
40+
id: test-repo-token
4141
with:
4242
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
4343
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
@@ -67,9 +67,9 @@ jobs:
6767
echo "repo=$repo" >> $GITHUB_OUTPUT
6868
6969
export GH_TOKEN="$(case "$repo" in
70-
gitgitgadget/git) echo "${{ steps.gitgitgadget-git-token.outputs.token }}";;
71-
git/git) echo "${{ steps.git-git-token.outputs.token }}";;
72-
dscho/git) echo "${{ steps.dscho-git-token.outputs.token }}";;
70+
gitgitgadget/git) echo "${{ steps.pr-repo-token.outputs.token }}";;
71+
git/git) echo "${{ steps.upstream-repo-token.outputs.token }}";;
72+
dscho/git) echo "${{ steps.test-repo-token.outputs.token }}";;
7373
*) echo "${{ secrets.GITHUB_TOKEN }}";;
7474
esac
7575
)"
@@ -86,9 +86,9 @@ jobs:
8686
- uses: gitgitgadget/gitgitgadget/handle-pr-comment@v1
8787
with:
8888
config: ${{ vars.CONFIG }}
89-
pr-repo-token: ${{ steps.gitgitgadget-git-token.outputs.token }}
90-
upstream-repo-token: ${{ steps.git-git-token.outputs.token }}
91-
test-repo-token: ${{ steps.dscho-git-token.outputs.token }}
89+
pr-repo-token: ${{ steps.pr-repo-token.outputs.token }}
90+
upstream-repo-token: ${{ steps.upstream-repo-token.outputs.token }}
91+
test-repo-token: ${{ steps.test-repo-token.outputs.token }}
9292
smtp-host: smtp.gmail.com
9393
smtp-user: gitgitgadget@gmail.com
9494
smtp-pass: "${{ secrets.GITGITGADGET_SMTP_PASS }}"
@@ -97,9 +97,9 @@ jobs:
9797
if: always() && steps.create-check-run.outputs.check_run_id != ''
9898
run: |
9999
export GH_TOKEN="$(case "${{ steps.create-check-run.outputs.repo }}" in
100-
gitgitgadget/git) echo "${{ steps.gitgitgadget-git-token.outputs.token }}";;
101-
git/git) echo "${{ steps.git-git-token.outputs.token }}";;
102-
dscho/git) echo "${{ steps.dscho-git-token.outputs.token }}";;
100+
gitgitgadget/git) echo "${{ steps.pr-repo-token.outputs.token }}";;
101+
git/git) echo "${{ steps.upstream-repo-token.outputs.token }}";;
102+
dscho/git) echo "${{ steps.test-repo-token.outputs.token }}";;
103103
*) echo "${{ secrets.GITHUB_TOKEN }}";;
104104
esac
105105
)"

‎.github/workflows/handle-pr-push.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ jobs:
2323

2424
steps:
2525
- uses: actions/create-github-app-token@v1
26-
id: gitgitgadget-git-token
26+
id: pr-repo-token
2727
with:
2828
app-id: ${{ secrets.GITGITGADGET_GITHUB_APP_ID }}
2929
private-key: ${{ secrets.GITGITGADGET_GITHUB_APP_PRIVATE_KEY }}
3030
owner: gitgitgadget
3131
repositories: git
3232
- uses: actions/create-github-app-token@v1
33-
id: git-git-token
33+
id: upstream-repo-token
3434
with:
3535
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
3636
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
3737
owner: git
3838
repositories: git
3939
- uses: actions/create-github-app-token@v1
40-
id: dscho-git-token
40+
id: test-repo-token
4141
with:
4242
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
4343
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
@@ -65,9 +65,9 @@ jobs:
6565
echo "repo=$repo" >> $GITHUB_OUTPUT
6666
6767
export GH_TOKEN="$(case "$repo" in
68-
gitgitgadget/git) echo "${{ steps.gitgitgadget-git-token.outputs.token }}";;
69-
git/git) echo "${{ steps.git-git-token.outputs.token }}";;
70-
dscho/git) echo "${{ steps.dscho-git-token.outputs.token }}";;
68+
gitgitgadget/git) echo "${{ steps.pr-repo-token.outputs.token }}";;
69+
git/git) echo "${{ steps.upstream-repo-token.outputs.token }}";;
70+
dscho/git) echo "${{ steps.test-repo-token.outputs.token }}";;
7171
*) echo "${{ secrets.GITHUB_TOKEN }}";;
7272
esac
7373
)"
@@ -84,17 +84,17 @@ jobs:
8484
- uses: gitgitgadget/gitgitgadget/handle-pr-push@v1
8585
with:
8686
config: ${{ vars.CONFIG }}
87-
pr-repo-token: ${{ steps.gitgitgadget-git-token.outputs.token }}
88-
upstream-repo-token: ${{ steps.git-git-token.outputs.token }}
89-
test-repo-token: ${{ steps.dscho-git-token.outputs.token }}
87+
pr-repo-token: ${{ steps.pr-repo-token.outputs.token }}
88+
upstream-repo-token: ${{ steps.upstream-repo-token.outputs.token }}
89+
test-repo-token: ${{ steps.test-repo-token.outputs.token }}
9090
pr-url: ${{ env.PR_URL }}
9191
- name: update the check run
9292
if: always() && steps.create-check-run.outputs.check_run_id != ''
9393
run: |
9494
export GH_TOKEN="$(case "${{ steps.create-check-run.outputs.repo }}" in
95-
gitgitgadget/git) echo "${{ steps.gitgitgadget-git-token.outputs.token }}";;
96-
git/git) echo "${{ steps.git-git-token.outputs.token }}";;
97-
dscho/git) echo "${{ steps.dscho-git-token.outputs.token }}";;
95+
gitgitgadget/git) echo "${{ steps.pr-repo-token.outputs.token }}";;
96+
git/git) echo "${{ steps.upstream-repo-token.outputs.token }}";;
97+
dscho/git) echo "${{ steps.test-repo-token.outputs.token }}";;
9898
*) echo "${{ secrets.GITHUB_TOKEN }}";;
9999
esac
100100
)"

‎.github/workflows/update-mail-to-commit-notes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- uses: actions/create-github-app-token@v1
18-
id: gitgitgadget-git-token
18+
id: pr-repo-token
1919
with:
2020
app-id: ${{ secrets.GITGITGADGET_GITHUB_APP_ID }}
2121
private-key: ${{ secrets.GITGITGADGET_GITHUB_APP_PRIVATE_KEY }}
@@ -24,4 +24,4 @@ jobs:
2424
- uses: gitgitgadget/gitgitgadget/update-mail-to-commit-notes@v1
2525
with:
2626
config: ${{ vars.CONFIG }}
27-
pr-repo-token: ${{ steps.gitgitgadget-git-token.outputs.token }}
27+
pr-repo-token: ${{ steps.pr-repo-token.outputs.token }}

‎.github/workflows/update-prs.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414

1515
steps:
1616
- uses: actions/create-github-app-token@v1
17-
id: gitgitgadget-git-token
17+
id: pr-repo-token
1818
with:
1919
app-id: ${{ secrets.GITGITGADGET_GITHUB_APP_ID }}
2020
private-key: ${{ secrets.GITGITGADGET_GITHUB_APP_PRIVATE_KEY }}
2121
owner: gitgitgadget
2222
repositories: git
2323
- uses: actions/create-github-app-token@v1
24-
id: git-git-token
24+
id: upstream-repo-token
2525
with:
2626
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
2727
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
2828
owner: git
2929
repositories: git
3030
- uses: actions/create-github-app-token@v1
31-
id: dscho-git-token
31+
id: test-repo-token
3232
with:
3333
app-id: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_ID }}
3434
private-key: ${{ secrets.GITGITGADGET_GIT_GITHUB_APP_PRIVATE_KEY }}
@@ -37,6 +37,6 @@ jobs:
3737
- uses: gitgitgadget/gitgitgadget/update-prs@v1
3838
with:
3939
config: ${{ vars.CONFIG }}
40-
pr-repo-token: ${{ steps.gitgitgadget-git-token.outputs.token }}
41-
upstream-repo-token: ${{ steps.git-git-token.outputs.token }}
42-
test-repo-token: ${{ steps.dscho-git-token.outputs.token }}
40+
pr-repo-token: ${{ steps.pr-repo-token.outputs.token }}
41+
upstream-repo-token: ${{ steps.upstream-repo-token.outputs.token }}
42+
test-repo-token: ${{ steps.test-repo-token.outputs.token }}

0 commit comments

Comments
 (0)