Skip to content

Replace legacy CI credentials #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alixander merged 1 commit into from
Aug 3, 2026
Merged

Replace legacy CI credentials #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,30 @@ concurrency:
jobs:
ci:
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
steps:
- uses: actions/checkout@v3
- run: COLOR=1 ./ci/ci.sh
env:
GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
nofixups:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v3
- run: COLOR=1 ./bin/nofixups.sh
env:
GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
signed:
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- uses: actions/checkout@v3
- run: COLOR=1 ./bin/ensure_signed.sh
env:
GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
5 changes: 4 additions & 1 deletion .github/workflows/daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ concurrency:
jobs:
ci:
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
steps:
- uses: actions/checkout@v3
- run: COLOR=1 CI_FORCE=1 ./ci/ci.sh
env:
GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
11 changes: 2 additions & 9 deletions lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,6 @@ git_commit_count() {
(git rev-list HEAD --count 2>/dev/null) || echo 0
}

configure_github_token() {
git config --global credential.helper store
cat > ~/.git-credentials <<EOF
https://cyborg-ts:$GITHUB_TOKEN@github.com
EOF
}

git_pure() {
if [ -z "${GIT_CONFIG_PURE-}" ]; then
GIT_CONFIG_PURE="$(mktempd)/gitconfig-pure"
Expand All @@ -381,8 +374,8 @@ git_pure() {
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global pager.diff 'diff-highlight | less'
fi
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global init.defaultBranch master
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.name "Cyborg Tstruct"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.email "info+cyborg@terrastruct.com"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.name "D2 CI"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.email "ci@d2lang.com"
export _GIT_CONFIG_PURE=1
fi
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE gitc "$@"
Expand Down
11 changes: 2 additions & 9 deletions lib/git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,6 @@ git_commit_count() {
(git rev-list HEAD --count 2>/dev/null) || echo 0
}

configure_github_token() {
git config --global credential.helper store
cat > ~/.git-credentials <<EOF
https://cyborg-ts:$GITHUB_TOKEN@github.com
EOF
}

git_pure() {
if [ -z "${GIT_CONFIG_PURE-}" ]; then
GIT_CONFIG_PURE="$(mktempd)/gitconfig-pure"
Expand All @@ -223,8 +216,8 @@ git_pure() {
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global pager.diff 'diff-highlight | less'
fi
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global init.defaultBranch master
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.name "Cyborg Tstruct"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.email "info+cyborg@terrastruct.com"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.name "D2 CI"
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE command git config --global user.email "ci@d2lang.com"
export _GIT_CONFIG_PURE=1
fi
GIT_CONFIG_GLOBAL=$GIT_CONFIG_PURE gitc "$@"
Expand Down
Loading