diff --git a/.github/workflows/authors.yml b/.github/workflows/authors.yml index 35b0456ae3..c93e9b28bc 100644 --- a/.github/workflows/authors.yml +++ b/.github/workflows/authors.yml @@ -20,8 +20,8 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - run: sudo apt -y install git - - name: Export known authors from master branch - run: git log --format="%an <%ae>" origin/master | sort | uniq > authors.txt + - name: Export known authors from main branch + run: git log --format="%an <%ae>" origin/main | sort | uniq > authors.txt - name: Export authors from new commits run: git log --format="%an <%ae>" ${{ github.event.pull_request.base.sha }}... | sort | uniq > commit-authors.txt - name: Check new authors diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 297317efb8..77d4befa2b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,12 +2,12 @@ name: "CodeQL" on: push: - branches: [ master ] + branches: [ main-7.0.x ] paths-ignore: - "doc/**" pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [ main-7.0.x ] paths-ignore: - "doc/**" schedule: diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 5f6a9187c4..c207828ccf 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -4,8 +4,8 @@ on: push: # Only run on pushes to pull request branches branches-ignore: - - 'master' - - 'master-*' + - 'main' + - 'main-*' paths-ignore: - "doc/**" pull_request: @@ -74,13 +74,13 @@ jobs: zlib1g-dev # Checking out the branch is not as simple as "checking out". # - # In case master has any new commits since we branched off, github will - # automatically add a "merge commit" from our branch to master and check + # In case main has any new commits since we branched off, github will + # automatically add a "merge commit" from our branch to main and check # this out instead of the original last commit on the branch. # # This screws up git clang-format as it'll also format the "merge commit" # and essentially report any formatting issues in the "merge commit". - # However, we really don't care about any of the new commits on master. + # However, we really don't care about any of the new commits on main. # # There are supposed to be ways to use with/ref to fix that and while # they work perfectly well for pull requests within the forked repo, none @@ -113,7 +113,7 @@ jobs: # # Commit history example in case github added merge, i.e. if you did # git log --pretty=oneline -2: - # sha_1 Merge sha_2 into latest_sha_on_master + # sha_1 Merge sha_2 into latest_sha_on_main # sha_2 This is the real last commit on branch echo "Last two commits on checkout:" git log --pretty=oneline -2 @@ -121,7 +121,7 @@ jobs: second_last_commit_sha=$(git log --pretty=%H -2 |tail -1) echo "$last_commit_subject" | grep -e "^Merge $second_last_commit_sha into [0-9a-fA-F]*$" > /dev/null 2>&1 if [ $? -eq 0 ]; then - # Last commit was a merge to master - ignore + # Last commit was a merge to main - ignore echo "Found github merge commit - checking out real last commit instead..." git checkout $second_last_commit_sha else diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index b634de025f..f62cb42daf 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -5,7 +5,7 @@ on: schedule: - cron: '28 22 * * 6' push: - branches: [ master ] + branches: [ main-7.0.x ] concurrency: group: ${{ github.workflow }}-${{ github.ref }}