Skip to content

Commit 451ff15

Browse files
committed
Persist checkout credentials and fail on tag auth errors
1 parent 6a2bc40 commit 451ff15

2 files changed

Lines changed: 8 additions & 26 deletions

File tree

.github/workflows/tag-if-missing.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,23 @@ jobs:
3333
token: ${{ steps.generate_token.outputs.token }}
3434
ref: main
3535
fetch-depth: 0
36-
persist-credentials: false
37-
38-
- name: Add Toolbox Envy to PATH
39-
uses: EarthmanMuons/toolbox-envy/.github/actions/add-to-path@main
40-
with:
41-
include_bins: ${{ inputs.toolbox_envy_bins }}
36+
persist-credentials: true
4237

4338
- name: Configure Git identity
4439
run: |
4540
git config user.name "senile-errata[bot]"
4641
git config user.email "senile-errata@users.noreply.github.com"
4742
43+
- name: Add Toolbox Envy to PATH
44+
uses: EarthmanMuons/toolbox-envy/.github/actions/add-to-path@main
45+
with:
46+
include_bins: ${{ inputs.toolbox_envy_bins }}
47+
4848
- id: tag
4949
name: Add any missing tags
5050
run: |
5151
set -euo pipefail
52-
tag="$(get-project-version | tag-if-missing || true)"
52+
tag="$(get-project-version | tag-if-missing)"
5353
echo "tag=$tag" >>"$GITHUB_OUTPUT"
5454
5555
- name: Annotate workflow run with new tag

.github/workflows/tag-untagged-releases-rust.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
ref: main
3535
token: ${{ steps.generate_token.outputs.token }}
3636
fetch-depth: 0
37-
persist-credentials: false
37+
persist-credentials: true
3838

3939
- name: Configure Git identity
4040
run: |
@@ -69,27 +69,9 @@ jobs:
6969
- name: Add any missing tags
7070
run: cargo release tag -v --execute --no-confirm || true
7171

72-
- name: Mask GitHub App token
73-
env:
74-
TOKEN: ${{ steps.generate_token.outputs.token }}
75-
run: echo "::add-mask::${TOKEN}"
76-
77-
- name: Configure Git credentials for tag push
78-
run: |
79-
git config --global url."https://x-access-token:${TOKEN}@github.com/".insteadOf "https://github.com/"
80-
env:
81-
TOKEN: ${{ steps.generate_token.outputs.token }}
82-
8372
- name: Push any new tags
8473
run: cargo release push -v --execute --no-confirm
8574

86-
- name: Remove Git credentials override
87-
if: always()
88-
env:
89-
TOKEN: ${{ steps.generate_token.outputs.token }}
90-
run: |
91-
git config --global --unset-all url."https://x-access-token:${TOKEN}@github.com/".insteadOf
92-
9375
- name: Capture tags after
9476
run: |
9577
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)

0 commit comments

Comments
 (0)