rename master to main (#8245)

As we strive for more inclusiveness, we are becoming less comfortable with historically-charged terms being used in our everyday work. This is targeted for merge on Dec 26, _after_ the necessary corresponding changes at both the GitHub and Azure Pipelines levels. CHANGELOG_BEGIN - DAML Connect development is now conducted from the `main` branch, rather than the `master` one. If you had any dependency on the digital-asset/daml repository, you will need to update this parameter. CHANGELOG_END
digital-asset · Dec 27, 2020 · 93f449d · 93f449d
1 parent c33140c
commit 93f449d
Show file tree

Hide file tree

Showing 44 changed files with 107 additions and 107 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,6 @@
 ### Pull Request Checklist
 
-- [ ] Read and understand the [contribution guidelines](https://github.com/digital-asset/daml/blob/master/CONTRIBUTING.md)
+- [ ] Read and understand the [contribution guidelines](https://github.com/digital-asset/daml/blob/main/CONTRIBUTING.md)
 - [ ] Include appropriate tests
 - [ ] Set a descriptive title and thorough description
 - [ ] Add a reference to the [issue this PR will solve](https://github.com/digital-asset/daml/issues), if appropriate

diff --git a/BAZEL-haskell.md b/BAZEL-haskell.md
@@ -259,6 +259,6 @@ may take some time if the required artifacts are not built or cached already.
 
 ## Further reading:
 
-- ["Bazel User Guide"](https://github.com/digital-asset/daml/blob/master/BAZEL.md) (DAML specific)
+- ["Bazel User Guide"](https://github.com/digital-asset/daml/blob/main/BAZEL.md) (DAML specific)
 - ["A Users's Guide to Bazel"](https://docs.bazel.build/versions/master/guide.html) (official documentation)
 - [`rules_haskell` documentation](https://api.haskell.build/index.html) (core Haskell rules, Haddock support, Linting, Defining toolchains, Support for protocol buffers, Interop with `cc_*` rules, Workspace rules)
diff --git a/BAZEL.md b/BAZEL.md
@@ -240,14 +240,14 @@ additional_languages:
 
 Click "Next" once you are ready. You will be able to modify the project view
 file whenever you like, so don't worry too much.
- 
-The first import of the project might fail due to a resolution error of the 
+
+The first import of the project might fail due to a resolution error of the
 `bazel` binary. In order to solve this, configure the Bazel plugin settings
-with the location of the `bazel` binary, 
-by setting _Preferences_ → _Bazel Settings_ → _Bazel binary location_ 
+with the location of the `bazel` binary,
+by setting _Preferences_ → _Bazel Settings_ → _Bazel binary location_
 to `./dev-env/bin/bazel`.
 
-Now, re-trigger a sync of the workspace (IntelliJ Action: 
+Now, re-trigger a sync of the workspace (IntelliJ Action:
 _Sync project with BUILD files_). This process will take a while.
 
 [intellij_project_view]: https://ij.bazel.build/docs/project-views.html
@@ -328,8 +328,8 @@ or "OK" to add the run configuration.
 #### Attaching sources to scala library
 
 If you do not have the Scala library sources linked (you only see the decompiled
- sources), you can attach it manually by selecting the `Choose sources...` 
- button on the yellow bar at the top, and selecting `scala-library...-src.jar`. 
+ sources), you can attach it manually by selecting the `Choose sources...`
+ button on the yellow bar at the top, and selecting `scala-library...-src.jar`.
 
 ### Known Issues
 
@@ -753,7 +753,7 @@ More comprehensive documentation on the `bazel` command can be found
 If your work goes beyond simply adding targets to existing
 `BUILD.bazel` files and involves things like defining toolchains and
 external dependencies, then [this
-document](https://github.com/digital-asset/daml/blob/master/BAZEL-haskell.md)
+document](https://github.com/digital-asset/daml/blob/main/BAZEL-haskell.md)
 is for you!
 
 ## Scala in Bazel

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ For Git commit messages, our principle is that `git log --pretty=oneline` should
 * Read this document (contribution guidelines).
 * Does your PR include appropriate tests?
 * Make sure your PR title and description makes it easy for other developers to understand what the contained commits do. The title should say what the changes do. The description should expand on what it does (if not obvious from the title alone), and say why it is being done.
-* If your PR corresponds to an issue, add “Fixes #XX” to your pull request description. This will auto-close the corresponding issue when the commit is merged into master and tie the PR to the issue.
+* If your PR corresponds to an issue, add “Fixes #XX” to your pull request description. This will auto-close the corresponding issue when the commit is merged into main and tie the PR to the issue.
 * the squashed commit for the PR **MUST** include in its body a section between the ``CHANGELOG_BEGIN`` and ``CHANGELOG_END`` tags. This section **MAY** include a list of _user-facing_ changes [Follow these guidelines on how to write a good changelog entry](#writing-a-good-changelog-entry).
 
 The following is an example of a well-formed commit, including the description (first line) and a body that includes changelog additions:
@@ -45,7 +45,7 @@ The following is an example of a well-formed commit, including the description (
 
       CHANGELOG_END
 
-If you want to amend an existing changelog entry part of a PR already merged on master, do so by adding a ``WARNING`` to your changelog additions:
+If you want to amend an existing changelog entry part of a PR already merged on main, do so by adding a ``WARNING`` to your changelog additions:
 
       CHANGELOG_BEGIN
 
@@ -65,9 +65,9 @@ If the PR contains no _user-facing_ change, the section **MUST** be there but ca
       CHANGELOG_BEGIN
       CHANGELOG_END
 
-If you want to verify the changelog entries as described by a range of Git revisions, you can use the `unreleased.sh` script. In most cases, to see the entries added as part of commits added since branching off of `master`, you can run:
+If you want to verify the changelog entries as described by a range of Git revisions, you can use the `unreleased.sh` script. In most cases, to see the entries added as part of commits added since branching off of `main`, you can run:
 
-    ./unreleased.sh master..
+    ./unreleased.sh main..
 
 ## Writing a good changelog entry
 

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 [![DAML logo](daml-logo.png)](https://www.daml.com)
 
 [![Download](https://img.shields.io/github/release/digital-asset/daml.svg?label=Download)](https://docs.daml.com/getting-started/installation.html)
-[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/master/LICENSE)
-[![Build](https://dev.azure.com/digitalasset/daml/_apis/build/status/digital-asset.daml?branchName=master&label=Build)](https://dev.azure.com/digitalasset/daml/_build/latest?definitionId=4&branchName=master)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/digital-asset/daml/blob/main/LICENSE)
+[![Build](https://dev.azure.com/digitalasset/daml/_apis/build/status/digital-asset.daml?branchName=main&label=Build)](https://dev.azure.com/digitalasset/daml/_build/latest?definitionId=4&branchName=main)
 
 Copyright 2020 Digital Asset (Switzerland) GmbH and/or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: Apache-2.0

diff --git a/azure-cron.yml b/azure-cron.yml
@@ -6,7 +6,7 @@
 # Do not run on PRs
 pr: none
 
-# Do not run on merge to master
+# Do not run on merge to main
 trigger: none
 
 # Do run on a schedule (hourly)
@@ -24,7 +24,7 @@ trigger: none
 #  displayName: hourly cron
 #  branches:
 #    include:
-#    - master
+#    - main
 #  always: true
 
 jobs:
@@ -54,7 +54,7 @@ jobs:
                -H 'Content-type: application/json' \
                --data "{\"text\":\"<!here> *FAILED* Daily Docs: <https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|$MESSAGE>\n\"}" \
                $(Slack.team-daml)
-        condition: and(failed(), eq(variables['Build.SourceBranchName'], 'master'))
+        condition: and(failed(), eq(variables['Build.SourceBranchName'], 'main'))
       - template: ci/tell-slack-failed.yml
 
   - job: docker_image

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,15 +10,15 @@ trigger:
   batch: false
   branches:
     include:
-      - master
+      - main
       - release/*
 
-# Enable PR triggers that target the master branch
+# Enable PR triggers that target the main branch
 pr:
   autoCancel: true # cancel previous builds on push
   branches:
     include:
-      - master
+      - main
       - release/*
 
 jobs:
@@ -31,11 +31,11 @@ jobs:
           set -euo pipefail
           if [ "$(Build.Reason)" == "PullRequest" ]; then
               echo "##vso[task.setvariable variable=branch;isOutput=true]$(git rev-parse HEAD^2)"
-              echo "##vso[task.setvariable variable=master;isOutput=true]$(git rev-parse HEAD^1)"
+              echo "##vso[task.setvariable variable=main;isOutput=true]$(git rev-parse HEAD^1)"
               echo "##vso[task.setvariable variable=fork_point;isOutput=true]$(git merge-base $(git rev-parse HEAD^1) $(git rev-parse HEAD^2))"
           else
               echo "##vso[task.setvariable variable=branch;isOutput=true]$(git rev-parse HEAD)"
-              echo "##vso[task.setvariable variable=master;isOutput=true]$(git rev-parse HEAD^1)"
+              echo "##vso[task.setvariable variable=main;isOutput=true]$(git rev-parse HEAD^1)"
               echo "##vso[task.setvariable variable=fork_point;isOutput=true]$(git rev-parse HEAD^1)"
           fi
         name: out
@@ -409,7 +409,7 @@ jobs:
     dependsOn: [ "check_for_release", "Linux", "macOS", "Windows" ]
     condition: and(succeeded(),
                    eq(dependencies.check_for_release.outputs['out.is_release'], 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
     pool:
       vmImage: "Ubuntu-16.04"
     variables:
@@ -572,7 +572,7 @@ jobs:
           curl -XPOST \
                -i \
                -H 'Content-Type: application/json' \
-               --data "{\"text\":\"<@${pr_handler}> Release \`$(release_tag)\` is ready for testing. See <https://github.com/digital-asset/daml/blob/master/release/RELEASE.md|release instructions>. (<https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|build>, <https://github.com/digital-asset/daml/commit/$(trigger_sha)|trigger commit>, <https://github.com/digital-asset/daml/commit/$(release_sha)|target commit>)\"}" \
+               --data "{\"text\":\"<@${pr_handler}> Release \`$(release_tag)\` is ready for testing. See <https://github.com/digital-asset/daml/blob/main/release/RELEASE.md|release instructions>. (<https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|build>, <https://github.com/digital-asset/daml/commit/$(trigger_sha)|trigger commit>, <https://github.com/digital-asset/daml/commit/$(release_sha)|target commit>)\"}" \
                $(Slack.team-daml)
       - template: ci/tell-slack-failed.yml
         parameters:
@@ -619,7 +619,7 @@ jobs:
         done
 
         trap "git checkout $(branch_sha)" EXIT
-        git checkout origin/master
+        git checkout origin/main
         cp .bazelrc compatibility/
         compatibility/update-versions.sh
         git add compatibility/versions.bzl compatibility/maven_install.json
@@ -700,7 +700,7 @@ jobs:
       compatibility_windows.status: $[ dependencies.compatibility_windows.result ]
 
       branch_sha: $[ dependencies.git_sha.outputs['out.branch'] ]
-      master_sha: $[ dependencies.git_sha.outputs['out.master'] ]
+      main_sha: $[ dependencies.git_sha.outputs['out.main'] ]
       fork_sha: $[ dependencies.git_sha.outputs['out.fork_point'] ]
 
       # Using expression syntax so we get an empty string if not set, rather
@@ -758,7 +758,7 @@ jobs:
            "branch": "$(Build.SourceBranch)",
            "merge_commit": "$(Build.SourceVersion)",
            "branch_commit": "$(branch_sha)",
-           "master_commit": "$(master_sha)",
+           "main_commit": "$(main_sha)",
            "fork_point_commit": "$(fork_sha)",
            "commit_message": $(echo -n "$COMMIT_MSG" | jq -sR),
            "is_fork": "$(System.PullRequest.IsFork)",
@@ -851,7 +851,7 @@ jobs:
               ;;
             *)
               # Should not be reached, but who knows?
-              msg="has completed with status $(status). See <https://github.com/digital-asset/daml/blob/master/release/RELEASE.md|RELEASE.md> for what to do next."
+              msg="has completed with status $(status). See <https://github.com/digital-asset/daml/blob/main/release/RELEASE.md|RELEASE.md> for what to do next."
               ;;
             esac
           tell_slack "<@${PR_HANDLER}> <https://dev.azure.com/digitalasset/daml/_build/results?buildId=$(Build.BuildId)|Build $(Build.BuildId)> for release PR <https://github.com/digital-asset/daml/pull/${PR}|#${PR}> $msg"

diff --git a/bazel_tools/pom_template.xml b/bazel_tools/pom_template.xml
@@ -32,7 +32,7 @@
   <scm>
     <connection>scm:git:git://github.com/digital-asset/daml.git</connection>
     <developerConnection>scm:git:ssh://github.com:digital-asset/daml.git</developerConnection>
-    <url>https://github.com/digital-asset/daml/tree/master</url>
+    <url>https://github.com/digital-asset/daml/tree/main</url>
   </scm>
 
   <dependencies>

diff --git a/ci/bash-lib.yml b/ci/bash-lib.yml
@@ -43,7 +43,7 @@ steps:
       git push origin $branch:$branch
       jq -n --arg title "$title" \
             --arg branch "$branch" \
-            '{"title": $title, "head": $branch, "base": "master"}' \
+            '{"title": $title, "head": $branch, "base": "main"}' \
         | curl -H "Content-Type: application/json" \
                -H "$(get_gh_auth_header)" \
                --fail \

diff --git a/ci/build-unix.yml b/ci/build-unix.yml
@@ -67,7 +67,7 @@ steps:
     name: publish_npm_mvn
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
   - bash: |
       set -euo pipefail
@@ -107,51 +107,51 @@ steps:
     name: publish
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.tarball)
       artifactName: $(publish.tarball)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.protos-zip)
       artifactName: $(publish.protos-zip)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.daml-on-sql)
       artifactName: $(publish.daml-on-sql)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.json-api)
       artifactName: $(publish.json-api)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.trigger-runner)
       artifactName: $(publish.trigger-runner)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
   - task: PublishPipelineArtifact@0
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.script-runner)
       artifactName: $(publish.script-runner)
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'),
+                   eq(variables['Build.SourceBranchName'], 'main'),
                    eq('${{parameters.name}}', 'linux'))
diff --git a/ci/build-windows.yml b/ci/build-windows.yml
@@ -51,18 +51,18 @@ steps:
       DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
   - task: PublishPipelineArtifact@0
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.installer)
       artifactName: $(publish.installer)
   - task: PublishPipelineArtifact@0
     condition: and(succeeded(),
                    eq(${{parameters.is_release}}, 'true'),
-                   eq(variables['Build.SourceBranchName'], 'master'))
+                   eq(variables['Build.SourceBranchName'], 'main'))
     inputs:
       targetPath: $(Build.StagingDirectory)/$(publish.tarball)
       artifactName: $(publish.tarball)
diff --git a/ci/check-changelog.sh b/ci/check-changelog.sh
@@ -67,6 +67,6 @@ to your commit message.
     return 1
 }
 
-BASE=${1:-origin/master}
+BASE=${1:-origin/main}
 
 has_a_changelog $BASE || is_dependabot_pr $BASE
diff --git a/ci/cron/daily-compat.yml b/ci/cron/daily-compat.yml
@@ -4,7 +4,7 @@
 # Do not run on PRs
 pr: none
 
-# Do not run on merge to master
+# Do not run on merge to main
 trigger: none
 
 # Do run on a schedule (daily)
@@ -19,7 +19,7 @@ schedules:
   displayName: daily checks and reporting
   branches:
     include:
-    - master
+    - main
   always: true
 
 jobs:

diff --git a/ci/cron/tuesday.yml b/ci/cron/tuesday.yml
@@ -9,7 +9,7 @@ schedules:
   displayName: Tuesday
   branches:
     include:
-    - master
+    - main
   always: true
 
 jobs:
@@ -30,4 +30,4 @@ jobs:
 
       RELEASE_MANAGER=$(head -1 release/rotation | awk '{print $1}')
 
-      tell_slack "Hi <@$RELEASE_MANAGER>! According to the <https://github.com/digital-asset/daml/blob/master/release/rotation|rotation>, you are in charge of the release tomorrow. Please make sure you plan accordingly, or find a replacement."
+      tell_slack "Hi <@$RELEASE_MANAGER>! According to the <https://github.com/digital-asset/daml/blob/main/release/rotation|rotation>, you are in charge of the release tomorrow. Please make sure you plan accordingly, or find a replacement."
diff --git a/ci/cron/wednesday.yml b/ci/cron/wednesday.yml
@@ -9,7 +9,7 @@ schedules:
   displayName: weekly snapshot
   branches:
     include:
-    - master
+    - main
   always: true
 
 jobs:
@@ -56,7 +56,7 @@ jobs:
                          --arg branch "$branch" \
                          --arg title "$title" \
                          --arg body "$(printf "$body")" \
-                         '{"title": $title, "head": $branch, "base": "master", "body": $body}' \
+                         '{"title": $title, "head": $branch, "base": "main", "body": $body}' \
                     | curl -H "Content-Type: application/json" \
                            -H "$AUTH" \
                            --silent \

diff --git a/ci/daily_tell_slack.yml b/ci/daily_tell_slack.yml
@@ -20,7 +20,7 @@ steps:
         MESSAGE="${{ parameters['success-message'] }}"
     fi
     PAYLOAD="{\"text\":$MESSAGE}"
-    if [ "$(Build.SourceBranchName)" = "master" ]; then
+    if [ "$(Build.SourceBranchName)" = "main" ]; then
         curl -XPOST \
              -i \
              -H 'Content-type: application/json' \

diff --git a/ci/tell-slack-failed.yml b/ci/tell-slack-failed.yml
@@ -24,5 +24,5 @@ steps:
            --data "{\"text\":\"$WARNING\n\"}" \
            $(Slack.team-daml)
     condition: and(failed(),
-                   or(eq(variables['Build.SourceBranchName'], 'master'),
+                   or(eq(variables['Build.SourceBranchName'], 'main'),
                       startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))