File tree 1 file changed +11
-3
lines changed
1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -19,10 +19,10 @@ main() {
19
19
echo " Adding Homebrew/homebrew-core as $( upstream) "
20
20
git remote add upstream https://github.com/Homebrew/homebrew-core.git
21
21
22
- echo " Fetching upstream commits... "
22
+ echo " Fetching upstream Homebrew/hombrew-core commits"
23
23
git fetch upstream
24
24
25
- echo " Merging in latest changes"
25
+ echo " Merging in latest Homebrew/homebrew-core changes"
26
26
git merge upstream/master
27
27
28
28
echo " Pushing changes to cdrci/homebrew-core fork on GitHub"
@@ -37,7 +37,15 @@ main() {
37
37
38
38
# Find the docs for bump-formula-pr here
39
39
# https://github.com/Homebrew/brew/blob/master/Library/Homebrew/dev-cmd/bump-formula-pr.rb#L18
40
- brew bump-formula-pr --force --version=" ${VERSION} " code-server --no-browse --no-audit
40
+ local output
41
+ if ! output=$( brew bump-formula-pr --version=" ${VERSION} " code-server --no-browse --no-audit 2>&1 ) ; then
42
+ if [[ $output == * " Duplicate PRs should not be opened" * ]]; then
43
+ echo " $VERSION is already submitted"
44
+ else
45
+ echo " $output "
46
+ exit 1
47
+ fi
48
+ fi
41
49
42
50
# Clean up and remove homebrew-core
43
51
cd ..
You can’t perform that action at this time.
0 commit comments