Skip to content

Commit c15cf47

Browse files
committed
ci: improve update-flake job to handle retriggering ci and human authors
Improves #14046 Solved the CI stuck issue exhibited in - #14039 - #14040 - #14041 - #14044
1 parent 893169c commit c15cf47

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,26 +121,31 @@ jobs:
121121
needs: changes
122122
if: needs.changes.outputs.gomod == 'true'
123123
runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
124-
permissions:
125-
# Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
126-
contents: write
127124
steps:
128125
- name: Checkout
129126
uses: actions/checkout@v4
130127
with:
131128
fetch-depth: 1
129+
token: ${{ secrets.CDRCI_GITHUB_TOKEN }}
132130

133131
- name: Setup Go
134132
uses: ./.github/actions/setup-go
135133

136134
- name: Update Nix Flake SRI Hash
137135
run: ./scripts/update-flake.sh
138136

137+
# auto update flake for dependabot
139138
- uses: stefanzweifel/git-auto-commit-action@v5
139+
if: github.actor == 'dependabot[bot]'
140140
with:
141141
# Allows dependabot to still rebase!
142142
commit_message: "[dependabot skip] Update Nix Flake SRI Hash"
143143

144+
# check for other PRs
145+
- name: Ensure No Changes
146+
if: github.actor != 'dependabot[bot]'
147+
run: git diff --exit-code
148+
144149
lint:
145150
needs: changes
146151
if: needs.changes.outputs.offlinedocs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'

0 commit comments

Comments
 (0)