diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 71891e5fe6a..0f377489df8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -2,7 +2,7 @@ name: Docs upload on: push: - branches: ["master"] + branches: ["main"] workflow_dispatch: jobs: @@ -32,6 +32,6 @@ jobs: git -c user.name="Workflow" -c user.email="" \ commit -q -m "Rebuild Servo documentation" git remote add origin https://git:${DOC_SERVO_ORG}@github.com/servo/doc.servo.org - git push --force origin master:gh-pages + git push --force origin main:gh-pages env: DOC_SERVO_ORG: ${{ secrets.DOC_SERVO_ORG }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 727584b0484..a372b3c0ebe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,10 +2,10 @@ name: Main on: push: - # Run the entire pipeline for 'master' even though the merge queue already runs checks + # Run the entire pipeline for 'main' even though the merge queue already runs checks # for every change. This just offers an extra layer of testing and covers the case of # random force pushes. - branches: ["master", "try"] + branches: ["main", "try"] pull_request: types: ['opened', 'synchronize'] branches: ["**"] @@ -56,7 +56,7 @@ jobs: let layout = "${{ inputs.layout }}" || "none"; let unit_tests = Boolean(${{ inputs.unit-tests }}) - // Merge queue runs and pushes to master should always trigger a full build and test. + // Merge queue runs and pushes to `main` should always trigger a full build and test. if (["push", "merge_group"].includes(context.eventName)) { platform = "all"; layout = "all"; diff --git a/.github/workflows/pull-request-wpt-export.yml b/.github/workflows/pull-request-wpt-export.yml index b9b34a902f2..9f0c4c82541 100644 --- a/.github/workflows/pull-request-wpt-export.yml +++ b/.github/workflows/pull-request-wpt-export.yml @@ -13,13 +13,9 @@ jobs: run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_ENV}" - name: Check out shallow servo PR run: | - mkdir servo + git clone --depth 1 ${{ github.event.repository.clone_url}} servo cd servo - git init -b main - git remote add origin ${{ github.event.repository.clone_url}} git fetch origin pull/${{ github.event.pull_request.number}}/head:pr --depth ${{ env.PR_FETCH_DEPTH }} - git fetch origin master:master --depth 1 - git checkout master - name: Check out wpt uses: actions/checkout@v3 with: diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index 8f9de901419..6b2c03918fc 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -5,7 +5,7 @@ name: Quick check on: push: branches-ignore: - ["master", "auto", "try", "try-*", "dependabot/**"] + ["main", "auto", "try", "try-*", "dependabot/**"] jobs: build-linux: @@ -13,4 +13,4 @@ jobs: if: github.repository != 'servo/servo' || github.event_name == 'workflow_dispatch' uses: ./.github/workflows/linux.yml with: - unit-tests: true \ No newline at end of file + unit-tests: true diff --git a/python/wpt/exporter/github.py b/python/wpt/exporter/github.py index 31fa5bb93c3..08b491765be 100644 --- a/python/wpt/exporter/github.py +++ b/python/wpt/exporter/github.py @@ -74,7 +74,7 @@ class GithubRepository: self, branch: GithubBranch ) -> Optional[PullRequest]: """If this repository has an open pull request with the - given source head reference targeting the master branch, + given source head reference targeting the main branch, return the first matching pull request, otherwise return None.""" params = "+".join([ @@ -105,7 +105,7 @@ class GithubRepository: data = { "title": title, "head": branch.get_pr_head_reference_for_repo(self), - "base": "master", + "base": "main", "body": body, "maintainer_can_modify": False, } diff --git a/python/wpt/exporter/step.py b/python/wpt/exporter/step.py index 9781353ce15..d56c4a3e852 100644 --- a/python/wpt/exporter/step.py +++ b/python/wpt/exporter/step.py @@ -190,7 +190,7 @@ class CreateOrUpdateBranchForPRStep(Step): return branch_name finally: try: - run.sync.local_wpt_repo.run("checkout", "master") + run.sync.local_wpt_repo.run("checkout", "main") run.sync.local_wpt_repo.run("branch", "-D", branch_name) except Exception: pass diff --git a/python/wpt/test.py b/python/wpt/test.py index f4744ae0030..f30e01eb79c 100644 --- a/python/wpt/test.py +++ b/python/wpt/test.py @@ -647,7 +647,7 @@ def setUpModule(): def setup_mock_repo(repo_name, local_repo): subprocess.check_output( ["cp", "-R", "-p", os.path.join(TESTS_DIR, repo_name), local_repo.path]) - local_repo.run("init", "-b", "master") + local_repo.run("init", "-b", "main") local_repo.run("add", ".") local_repo.run("commit", "-a", "-m", "Initial commit") diff --git a/python/wpt/tests/closed.json b/python/wpt/tests/closed.json index e81ff80eb2d..25eab31ba6d 100644 --- a/python/wpt/tests/closed.json +++ b/python/wpt/tests/closed.json @@ -196,12 +196,12 @@ "forks": 1731, "open_issues": 2072, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348", "user": { "login": "servo", @@ -309,7 +309,7 @@ "forks": 1731, "open_issues": 2072, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -439,7 +439,7 @@ "forks": 1731, "open_issues": 2072, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo", diff --git a/python/wpt/tests/edited.json b/python/wpt/tests/edited.json index 4af10d6e5b9..4bed4dbf54f 100644 --- a/python/wpt/tests/edited.json +++ b/python/wpt/tests/edited.json @@ -43,8 +43,8 @@ "author_association": "OWNER", "auto_merge": null, "base": { - "label": "mrobinson:master", - "ref": "master", + "label": "mrobinson:main", + "ref": "main", "repo": { "allow_auto_merge": false, "allow_forking": true, @@ -65,7 +65,7 @@ "contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}", "contributors_url": "https://api.github.com/repos/servo/servo/contributors", "created_at": "2014-03-31T16:17:52Z", - "default_branch": "master", + "default_branch": "main", "delete_branch_on_merge": false, "deployments_url": "https://api.github.com/repos/servo/servo/deployments", "description": "The Servo Browser Engine", @@ -218,7 +218,7 @@ "contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}", "contributors_url": "https://api.github.com/repos/servo/servo/contributors", "created_at": "2014-03-31T16:17:52Z", - "default_branch": "master", + "default_branch": "main", "delete_branch_on_merge": false, "deployments_url": "https://api.github.com/repos/servo/servo/deployments", "description": "The Servo Browser Engine", @@ -400,7 +400,7 @@ "contents_url": "https://api.github.com/repos/servo/servo/contents/{+path}", "contributors_url": "https://api.github.com/repos/servo/servo/contributors", "created_at": "2014-03-31T16:17:52Z", - "default_branch": "master", + "default_branch": "main", "deployments_url": "https://api.github.com/repos/servo/servo/deployments", "description": "The Servo Browser Engine", "disabled": false, diff --git a/python/wpt/tests/merged.json b/python/wpt/tests/merged.json index 4fe373ad7b3..abb1aa9cb59 100644 --- a/python/wpt/tests/merged.json +++ b/python/wpt/tests/merged.json @@ -203,12 +203,12 @@ "forks": 0, "open_issues": 0, "watchers": 0, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc", "user": { "login": "servo", @@ -323,7 +323,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -478,7 +478,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo", diff --git a/python/wpt/tests/opened-with-no-sync-signal.json b/python/wpt/tests/opened-with-no-sync-signal.json index 1a1671632a4..d14b0814937 100644 --- a/python/wpt/tests/opened-with-no-sync-signal.json +++ b/python/wpt/tests/opened-with-no-sync-signal.json @@ -160,12 +160,12 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348", "user": { "login": "servo", @@ -273,7 +273,7 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -403,7 +403,7 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo", diff --git a/python/wpt/tests/opened.json b/python/wpt/tests/opened.json index 97a02be58b5..709fe397edd 100644 --- a/python/wpt/tests/opened.json +++ b/python/wpt/tests/opened.json @@ -160,12 +160,12 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "3b7a82b8c743bcbbefb6f25defd4cc132c25c348", "user": { "login": "servo", @@ -273,7 +273,7 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -403,7 +403,7 @@ "forks": 1731, "open_issues": 2073, "watchers": 10131, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo", diff --git a/python/wpt/tests/synchronize-multiple.json b/python/wpt/tests/synchronize-multiple.json index 239d8d00e5a..6272d34c0df 100644 --- a/python/wpt/tests/synchronize-multiple.json +++ b/python/wpt/tests/synchronize-multiple.json @@ -203,12 +203,12 @@ "forks": 0, "open_issues": 0, "watchers": 0, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc", "user": { "login": "servo", @@ -323,7 +323,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -462,7 +462,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo", diff --git a/python/wpt/tests/synchronize.json b/python/wpt/tests/synchronize.json index cbb0d8966b8..ec4d89d6702 100644 --- a/python/wpt/tests/synchronize.json +++ b/python/wpt/tests/synchronize.json @@ -203,12 +203,12 @@ "forks": 0, "open_issues": 0, "watchers": 0, - "default_branch": "master" + "default_branch": "main" } }, "base": { - "label": "servo:master", - "ref": "master", + "label": "servo:main", + "ref": "main", "sha": "df0f9ad7ae6f10ffeaf5d40f4a2a25abadabf9cc", "user": { "login": "servo", @@ -323,7 +323,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" } }, "_links": { @@ -462,7 +462,7 @@ "forks": 1810, "open_issues": 2027, "watchers": 10867, - "default_branch": "master" + "default_branch": "main" }, "organization": { "login": "servo",