Skip to content

Commit 1fe5e0c

Browse files
committed
master -> main branch renaming
1 parent 7150f48 commit 1fe5e0c

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/README-release.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Release Build
22

33
The github action creates a draft release for every build on the
4-
master branch. You can publish any release from the master branch
4+
main branch. You can publish any release from the main branch
55
as either "Pre-release" or final release upon publishing.
66

77
Idea is to delete intermediate releases after a while manually.
@@ -14,9 +14,9 @@ care for the rest.
1414
Format of the version follows https://semver.org the 3 segment
1515
is automatically increased with every build by github or for
1616
local builds is `-dev`. Also builds from a other branch than
17-
master get `-RC` as part of the version number.
17+
main get `-RC` as part of the version number.
1818

19-
A typical master branch version looks like `v1.2.432` a build from
19+
A typical main branch version looks like `v1.2.432` a build from
2020
any temporary branch is `v1.2-RC433`. Please also note that the numeric
2121
last part (patch) of github builds always increases and is never the
2222
same for 2 different builds.

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#
2121
name: OpenBikeSensor - CI
2222
on:
23-
# Trigger when pushing in master or pull requests, and when creating
23+
# Trigger when pushing in main or pull requests, and when creating
2424
# a pull request.
2525
push:
2626
branches:
27-
- master
27+
- main
2828
pull_request:
2929
types: [opened, synchronize, reopened]
3030

@@ -45,7 +45,7 @@ jobs:
4545
echo GITHUB Ref: ${{ github.ref }}
4646
VERSION_STRING=`grep "const char \*OBSVersion =" src/OpenBikeSensorFirmware.cpp`
4747
MAJOR=`echo ${VERSION_STRING} | cut -f2 -d\"`
48-
if [ "${{ github.ref }}" = "refs/heads/master" ]
48+
if [ "${{ github.ref }}" = "refs/heads/main" ]
4949
then
5050
PATCH=${GITHUB_RUN_NUMBER}
5151
SEPARATOR=.

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [ main ]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [ main ]
2020
schedule:
2121
- cron: '37 23 * * 1'
2222

0 commit comments

Comments
 (0)