Skip to content

Commit 56abc4a

Browse files
Merge pull request #3468 from cdr/jsjoeio/fix-3444
fix(publish): update cdrci fork in brew-bump.sh
2 parents 05197d5 + 8b38314 commit 56abc4a

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.github/workflows/publish.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ jobs:
4242
needs: npm
4343
runs-on: macos-latest
4444
steps:
45+
# Ensure things are up to date
46+
# Suggested by homebrew maintainers
47+
# https://github.com/Homebrew/discussions/discussions/1532#discussioncomment-782633
48+
- name: Set up Homebrew
49+
id: set-up-homebrew
50+
uses: Homebrew/actions/setup-homebrew@master
51+
4552
- uses: actions/checkout@v2
4653
- name: Configure git
4754
run: |

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ VS Code v0.00.0
5858
- chore: cross-compile docker images with buildx #3166 @oxy
5959
- chore: update node to v14 #3458 @oxy
6060

61+
### Development
62+
63+
- fix(publish): update cdrci fork in brew-bump.sh #3468 @jsjoeio
64+
6165
## 3.10.2
6266

6367
VS Code v1.56.1

ci/steps/brew-bump.sh

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,14 @@ main() {
2626
git merge upstream/master
2727

2828
echo "Pushing changes to cdrci/homebrew-core fork on GitHub"
29-
git push origin master
29+
# Source: https://serverfault.com/a/912788
30+
# shellcheck disable=SC2016,SC2028
31+
echo '#!/bin/sh\nexec echo "$HOMEBREW_GITHUB_API_TOKEN"' >"$HOME"/.git-askpass.sh
32+
# Ensure it's executable since we just created it
33+
chmod +x "$HOME/.git-askpass.sh"
34+
# GIT_ASKPASS lets us use the password when pushing without revealing it in the process list
35+
# See: https://serverfault.com/a/912788
36+
GIT_ASKPASS="$HOME/.git-askpass.sh" git push https://[email protected]/cdr-oss/homebrew-core.git --all
3037

3138
# Find the docs for bump-formula-pr here
3239
# https://github.com/Homebrew/brew/blob/master/Library/Homebrew/dev-cmd/bump-formula-pr.rb#L18

0 commit comments

Comments
 (0)