Skip to content
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

Move from master to main (step2) #533

Merged
merged 1 commit into from
Jan 26, 2021
Merged

Move from master to main (step2) #533

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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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
View file
Open in desktop
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