Skip to content

Commit 9f104ae

Browse files
committed
fix: remove upstream command thing
1 parent 2d8d9dd commit 9f104ae

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

ci/steps/brew-bump.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ main() {
3838
echo "Changing into homebrew-core directory"
3939
cd homebrew-core && pwd
4040

41-
echo "Adding Homebrew/homebrew-core as $(upstream)"
41+
echo "Adding Homebrew/homebrew-core"
4242
git remote add upstream https://github.com/Homebrew/homebrew-core.git
4343

4444
# Make sure the git remote step is successful
@@ -49,18 +49,24 @@ main() {
4949
exit 1
5050
fi
5151

52+
# TODO@jsjoeio - can I somehow check that this succeeded?
5253
echo "Fetching upstream Homebrew/hombrew-core commits"
5354
git fetch upstream
5455

56+
# TODO@jsjoeio - can I somehow check that this succeeded?
5557
echo "Merging in latest Homebrew/homebrew-core changes"
5658
git merge upstream/master
5759

5860
echo "Pushing changes to cdrci/homebrew-core fork on GitHub"
5961
# Source: https://serverfault.com/a/912788
6062
# shellcheck disable=SC2016,SC2028
6163
echo '#!/bin/sh\nexec echo "$HOMEBREW_GITHUB_API_TOKEN"' > "$HOME"/.git-askpass.sh
64+
65+
# TODO@jsjoeio - check that git-askpass.sh was created
6266
# Ensure it's executable since we just created it
6367
chmod +x "$HOME/.git-askpass.sh"
68+
69+
# TODO@jsjoeio - check that git-askpass.sh has executable permissions
6470
# GIT_ASKPASS lets us use the password when pushing without revealing it in the process list
6571
# See: https://serverfault.com/a/912788
6672
GIT_ASKPASS="$HOME/.git-askpass.sh" git push https://[email protected]/cdr-oss/homebrew-core.git --all
@@ -80,6 +86,8 @@ main() {
8086
# Clean up and remove homebrew-core
8187
cd ..
8288
rm -rf homebrew-core
89+
90+
# TODO@jsjoeio - check that homebrew-core was removed
8391
}
8492

8593
main "$@"

0 commit comments

Comments
 (0)