Commit fe0bfcfb authored by David Brown's avatar David Brown Committed by David Brown
Browse files

Migrate master->main 



Change references in CI and docs from 'master' to 'main' as the primary
branch has been renamed.

Signed-off-by: default avatarDavid Brown <david.brown@linaro.org>
parent 137d7971

.github/workflows/imgtool.yaml

+1 −1
Original line number Diff line number Diff line 
on:

  push:

    branches:

      - master

      - main

      - v*-branch



name: imgtool

.github/workflows/mynewt.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
on:

  push:

    branches:

      - master

      - main

  pull_request:



name: Mynewt

.github/workflows/sim.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
on:

  push:

    branches:

      - master

      - main

  pull_request:



name: Sim

README.md

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
[![Build Status (Sim)](https://github.com/mcu-tools/mcuboot/workflows/Sim/badge.svg)][sim]

[![Build Status (Mynewt)](https://github.com/mcu-tools/mcuboot/workflows/Mynewt/badge.svg)][mynewt]

[![Publishing Status (imgtool)](https://github.com/mcu-tools/mcuboot/workflows/imgtool/badge.svg)][imgtool]

[![Build Status (Travis CI)](https://img.shields.io/travis/mcu-tools/mcuboot/master.svg?label=travis-ci)][travis]

[![Build Status (Travis CI)](https://img.shields.io/travis/mcu-tools/mcuboot/main.svg?label=travis-ci)][travis]

[![Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)][license]



[pypi]: https://pypi.org/project/imgtool/
@@ -14,7 +14,7 @@ 
[mynewt]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:Mynewt

[imgtool]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:imgtool

[travis]: https://travis-ci.org/mcu-tools/mcuboot

[license]: https://github.com/mcu-tools/mcuboot/blob/master/LICENSE

[license]: https://github.com/mcu-tools/mcuboot/blob/main/LICENSE



This is mcuboot version 1.8.0-dev

ci/imgtool_install.sh

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
# limitations under the License.



if [[ $TRAVIS == "true" ]]; then

    if [[ $TRAVIS_PULL_REQUEST != "false" || $TRAVIS_BRANCH != "master" ]]; then

        echo "Either a PR or not \"master\" branch, exiting"

    if [[ $TRAVIS_PULL_REQUEST != "false" || $TRAVIS_BRANCH != "main" ]]; then

        echo "Either a PR or not \"main\" branch, exiting"

        exit 0

    fi

fi

CRA Git | Maintained and supported by SUSTech CRA and CCSE