Skip to content

Commit a546aca

Browse files
authored
ci: migrate master to main (#2881)
1 parent 3bce13f commit a546aca

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
if: |
204204
github.event_name == 'push' &&
205205
github.repository == 'graphql/graphql-js' &&
206-
github.ref == 'refs/heads/master'
206+
github.ref == 'refs/heads/main'
207207
needs: [test, fuzz, lint, checkForCommonlyIgnoredFiles, integrationTests]
208208
steps:
209209
- name: Checkout repo
@@ -239,7 +239,7 @@ jobs:
239239
if: |
240240
github.event_name == 'push' &&
241241
github.repository == 'graphql/graphql-js' &&
242-
github.ref == 'refs/heads/master'
242+
github.ref == 'refs/heads/main'
243243
needs: [test, fuzz, lint, checkForCommonlyIgnoredFiles, integrationTests]
244244
steps:
245245
- name: Checkout repo

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
The JavaScript reference implementation for GraphQL, a query language for APIs created by Facebook.
44

55
[![npm version](https://badge.fury.io/js/graphql.svg)](https://badge.fury.io/js/graphql)
6-
[![Build Status](https://github.com/graphql/graphql-js/workflows/CI/badge.svg?branch=master)](https://github.com/graphql/graphql-js/actions?query=branch%3Amaster)
7-
[![Coverage Status](https://codecov.io/gh/graphql/graphql-js/branch/master/graph/badge.svg)](https://codecov.io/gh/graphql/graphql-js)
6+
[![Build Status](https://github.com/graphql/graphql-js/workflows/CI/badge.svg?branch=main)](https://github.com/graphql/graphql-js/actions?query=branch%3Amain)
7+
[![Coverage Status](https://codecov.io/gh/graphql/graphql-js/branch/main/graph/badge.svg)](https://codecov.io/gh/graphql/graphql-js)
88

99
See more complete documentation at https://graphql.org/ and
1010
https://graphql.org/graphql-js/.
@@ -14,7 +14,7 @@ Looking for help? Find resources [from the community](https://graphql.org/commun
1414
## Getting Started
1515

1616
A general overview of GraphQL is available in the
17-
[README](https://github.com/graphql/graphql-spec/blob/master/README.md) for the
17+
[README](https://github.com/graphql/graphql-spec/blob/main/README.md) for the
1818
[Specification for GraphQL](https://github.com/graphql/graphql-spec). That overview
1919
describes a simple set of GraphQL examples that exist as [tests](src/__tests__)
2020
in this repository. A good way to get started with this repository is to walk
@@ -106,7 +106,7 @@ graphql(schema, query).then((result) => {
106106
### Want to ride the bleeding edge?
107107

108108
The `npm` branch in this repository is automatically maintained to be the last
109-
commit to `master` to pass all tests, in the same form found on npm. It is
109+
commit to `main` to pass all tests, in the same form found on npm. It is
110110
recommended to use builds deployed to npm for many reasons, but if you want to use
111111
the latest not-yet-released version of graphql-js, you can do so by depending
112112
directly on this branch:

resources/checkgit.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
trap "exit 1" ERR
33

44
#
5-
# This script determines if current git state is the up to date master. If so
5+
# This script determines if current git state is the up to date main. If so
66
# it exits normally. If not it prompts for an explicit continue. This script
77
# intends to protect from versioning for NPM without first pushing changes
8-
# and including any changes on master.
8+
# and including any changes on main.
99
#
1010

1111
# First fetch to ensure git is up to date. Fail-fast if this fails.
@@ -17,9 +17,9 @@ GIT_BRANCH=$(git branch -v 2> /dev/null | sed '/^[^*]/d');
1717
GIT_BRANCH_NAME=$(echo "$GIT_BRANCH" | sed 's/* \([A-Za-z0-9_\-]*\).*/\1/');
1818
GIT_BRANCH_SYNC=$(echo "$GIT_BRANCH" | sed 's/* [^[]*.\([^]]*\).*/\1/');
1919

20-
# Check if master is checked out
21-
if [ "$GIT_BRANCH_NAME" != "master" ]; then
22-
read -p "Git not on master but $GIT_BRANCH_NAME. Continue? (y|N) " yn;
20+
# Check if main is checked out
21+
if [ "$GIT_BRANCH_NAME" != "main" ]; then
22+
read -p "Git not on main but $GIT_BRANCH_NAME. Continue? (y|N) " yn;
2323
if [ "$yn" != "y" ]; then exit 1; fi;
2424
fi;
2525

resources/gitpublish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# This script maintains a git branch which mirrors master but in a form that
3+
# This script maintains a git branch which mirrors main but in a form that
44
# what will eventually be deployed to npm, allowing npm dependencies to use:
55
#
66
# "graphql": "git://github.com/graphql/graphql-js.git#npm"

0 commit comments

Comments
 (0)