diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 005866ee57..7cf8115023 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -3,7 +3,7 @@ name: Deploy gh-pages on: push: branches: - - master + - main paths: - .github/workflows/deploy.yml - common/** diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 56097dd955..cd99cf90ee 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -11,7 +11,7 @@ on: - "!examples/coding-template/**" push: branches-ignore: - - master + - main - "dependabot/**" paths: - ".github/workflows/regression.yml" @@ -53,7 +53,7 @@ jobs: run: ./scripts/regression-tests.sh if: github.event_name == 'push' env: - COMMIT_RANGE: "origin/master...${{ github.ref }}" + COMMIT_RANGE: "origin/main...${{ github.ref }}" CI_NODE_TOTAL: 5 CI_NODE_INDEX: ${{ matrix.CI_NODE_INDEX }} TEST_WAIT_TIME: 10000 diff --git a/README.md b/README.md index 4e32993519..91e5c00b78 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,8 @@ -[![Build Status](https://travis-ci.com/w3c/aria-practices.svg?branch=master)](https://travis-ci.com/w3c/aria-practices) - # WAI-ARIA: Authoring Practices Guide This repository maintains the WAI-ARIA Authoring Practices Guide. -* [Latest editor's draft built from master branch](http://w3c.github.io/aria-practices/) +* [Latest editor's draft built from main branch](http://w3c.github.io/aria-practices/) * [Most recent version published on w3.org](https://www.w3.org/TR/wai-aria-practices-1.1/) * Developed by the [Authoring Practices Task Force](https://www.w3.org/WAI/ARIA/task-forces/practices/) of the [ARIA Working Group](http://www.w3.org/WAI/ARIA/). * Staff contact: [Michael Cooper](http://www.w3.org/People/cooper/). @@ -101,7 +99,7 @@ offending character is indicated by the number `8` after the colon. Change the variable `value_nodes` to `valueNodes` in your source file to eliminate this error. -To see the complete list of style rules that are applied by ESLint, review the [.eslint.json](https://github.com/w3c/aria-practices/blob/master/.eslint.json) file in the root of the project. +To see the complete list of style rules that are applied by ESLint, review the [.eslintrc.json](.eslintrc.json) file in the root of the project. ### Editorial documentation @@ -114,7 +112,7 @@ for this specification. Note: These instructions are for editors of the APG who have repository commit access. -1. Go to the [editors draft on rawgit](https://cdn.rawgit.com/w3c/aria-practices/master/aria-practices.html) +1. Go to the [editors draft on rawgit](https://cdn.rawgit.com/w3c/aria-practices/main/aria-practices.html) 2. Press the ReSpec button (top right hand corner) 3. Select 'Save snapshot' 4. Select 'Save as HTML' diff --git a/scripts/regression-tests.sh b/scripts/regression-tests.sh index b36e3300e1..b35ede6fd6 100755 --- a/scripts/regression-tests.sh +++ b/scripts/regression-tests.sh @@ -3,7 +3,7 @@ if [[ "$CI" != "true" ]] then # When running this script locally, compare the current branch to master - COMMIT_RANGE="..master" + COMMIT_RANGE="..main" fi AVACMD="npm run regression -- -t"