diff --git a/ci/build.yml b/ci/build.yml index 4ea2ee801..d93676b2f 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -352,7 +352,7 @@ core unix frozen debug build arm: <<: *gitlab_caching needs: [] only: - - master + - main - tags - /^release\// - /^secfix\// @@ -535,7 +535,7 @@ legacy emu regular debug build arm: <<: *gitlab_caching needs: [] only: - - master + - main - tags - /^release\// - /^secfix\// diff --git a/ci/check_changelog.sh b/ci/check_changelog.sh index 05fc70c31..c9cab8489 100755 --- a/ci/check_changelog.sh +++ b/ci/check_changelog.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -base_branch=master +base_branch=main fail=0 subdirs="core core/embed/boardloader core/embed/bootloader core/embed/bootloader_ci legacy/bootloader legacy/firmware legacy/intermediate_fw python" diff --git a/ci/check_release_commit_messages.sh b/ci/check_release_commit_messages.sh index 93c1bd89d..e8c852c9d 100755 --- a/ci/check_release_commit_messages.sh +++ b/ci/check_release_commit_messages.sh @@ -2,21 +2,21 @@ fail=0 -git fetch origin master +git fetch origin main -# list all commits between HEAD and master -for commit in $(git rev-list origin/master..) +# list all commits between HEAD and main +for commit in $(git rev-list origin/main..) do message=$(git log -n1 --format=%B $commit) echo "Checking $commit" # The commit message must contain either - # 1. "cherry-picked from [some commit in master]" + # 1. "cherry-picked from [some commit in main]" if [[ $message =~ "(cherry picked from commit" ]]; then # remove last ")" and extract commit hash - master_commit=$(echo ${message:0:-1} | tr ' ' '\n' | tail -1) - # check if master really contains this commit hash - if [[ $(git branch -a --contains $master_commit | grep --only-matching "remotes/origin/master") == "remotes/origin/master" ]]; then + main_commit=$(echo ${message:0:-1} | tr ' ' '\n' | tail -1) + # check if main really contains this commit hash + if [[ $(git branch -a --contains $main_commit | grep --only-matching "remotes/origin/main") == "remotes/origin/main" ]]; then continue fi fi diff --git a/ci/posttest.yml b/ci/posttest.yml index ad25a8bf1..f2c64adc7 100644 --- a/ci/posttest.yml +++ b/ci/posttest.yml @@ -33,7 +33,7 @@ core unix coverage posttest: unix ui changes: stage: posttest except: - - master + - main <<: *gitlab_caching needs: - core click test diff --git a/ci/prebuild.yml b/ci/prebuild.yml index 7c4057c91..5e8b7553a 100644 --- a/ci/prebuild.yml +++ b/ci/prebuild.yml @@ -47,7 +47,7 @@ release commit messages prebuild: stage: prebuild before_script: [] # nothing needed variables: - # We need to clone the repo properly so we can work with origin/master. + # We need to clone the repo properly so we can work with origin/main. GIT_STRATEGY: clone only: refs: @@ -63,7 +63,7 @@ release commit messages prebuild: changelog prebuild: stage: prebuild except: - - master + - main before_script: [] # nothing needed variables: GIT_SUBMODULE_STRATEGY: "none"