mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Rename the master
branch to main
This commit is contained in:
parent
7bcb25c85c
commit
23add0c1e5
14 changed files with 47 additions and 51 deletions
4
.github/workflows/docs.yml
vendored
4
.github/workflows/docs.yml
vendored
|
@ -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 }}
|
||||
|
|
6
.github/workflows/main.yml
vendored
6
.github/workflows/main.yml
vendored
|
@ -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";
|
||||
|
|
|
@ -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:
|
||||
|
|
4
.github/workflows/quick-check.yml
vendored
4
.github/workflows/quick-check.yml
vendored
|
@ -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
|
||||
unit-tests: true
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue