Skip to content

Commit

Permalink
finish master to main migration (#533)
Browse files Browse the repository at this point in the history
  • Loading branch information
reyang authored Jan 26, 2021
1 parent 484700a commit 47d6554
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [ main, master ]
branches: [ main ]
pull_request:
branches: [ main, master ]
branches: [ main ]

jobs:
cmake_test:
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/pre_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if [ ! grep -q "^\#\# \[Unreleased\]$" $changelog_file ]; then
exit 1
fi

git checkout -b pre_release_${tag} master
git checkout -b pre_release_${tag} main
if [ $? -ne 0 ]; then
echo "Error: Cannot create release branch. Ensure you have sufficient permissions to repo and try again."
exit 1
Expand All @@ -67,5 +67,5 @@ fi
git add CHANGELOG.md
git commit -m "Prepare for releasing ${tag}"

echo "Now validate the chages using git diff master, create the ${tag} and push changes to upstream"
echo "Now validate the changes using git diff main, create the ${tag} and push changes to upstream"
echo

0 comments on commit 47d6554

Please sign in to comment.