Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: remaining references to master (now main) (#1083)
  • Loading branch information
JamesHenry committed Jul 8, 2022
1 parent 9b348c0 commit 8d36232
Show file tree
Hide file tree
Showing 12 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/eslint-plugin-template.md
Expand Up @@ -22,7 +22,7 @@ Are you opening an issue because the rule you're trying to use is not found?
1) Check the releases log: https://github.com/angular-eslint/angular-eslint/releases
- If the rule isn't listed there, then chances are it hasn't been released to the main npm tag yet.
2) Try installing the `canary` tag: `npm i @angular-eslint/eslint-plugin-template@canary`.
- The canary tag is built for every commit to master, so it contains the bleeding edge build.
- The canary tag is built for every commit to main, so it contains the bleeding edge build.
3) If ESLint still can't find the rule, then consider reporting an issue.
-->

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/eslint-plugin.md
Expand Up @@ -22,7 +22,7 @@ Are you opening an issue because the rule you're trying to use is not found?
1) Check the releases log: https://github.com/angular-eslint/angular-eslint/releases
- If the rule isn't listed there, then chances are it hasn't been released to the main npm tag yet.
2) Try installing the `canary` tag: `npm i @angular-eslint/eslint-plugin@canary`.
- The canary tag is built for every commit to master, so it contains the bleeding edge build.
- The canary tag is built for every commit to main, so it contains the bleeding edge build.
3) If ESLint still can't find the rule, then consider reporting an issue.
-->

Expand Down
Expand Up @@ -7,7 +7,7 @@ name: Auto-close dependabot PRs targeting integration test fixtures

on:
pull_request:
branches: [master]
branches: [main]
paths:
- 'packages/integration-tests/fixtures/**'

Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci.yml
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master, 'next-major-release/**']
branches: [main, 'next-major-release/**']

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
Expand Down Expand Up @@ -41,8 +41,6 @@ jobs:

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v2
with:
main-branch-name: master

- name: Install node and npm based on the volta config in our package.json
uses: volta-cli/action@v1
Expand Down Expand Up @@ -156,8 +154,6 @@ jobs:

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v2
with:
main-branch-name: master

- uses: volta-cli/action@v1
with:
Expand Down Expand Up @@ -202,7 +198,7 @@ jobs:
name: Publish the latest code as a canary version
runs-on: ubuntu-latest
needs: [create_nx_run_group, primary, unit_tests_on_other_node_versions]
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
steps:
- name: Set NX_RUN_GROUP based on the output of the create_nx_run_group job
run: echo "NX_RUN_GROUP=${{ needs.create_nx_run_group.outputs.nx_run_group }}" >> $GITHUB_ENV
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/nx-migrate.yml
Expand Up @@ -8,7 +8,7 @@ name: Nx Migrate

on:
pull_request:
branches: [master]
branches: [main]
paths:
- 'package.json'

Expand All @@ -32,8 +32,6 @@ jobs:

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v2
with:
main-branch-name: master

- name: Check if @nrwl/workspace was changed as part of the latest commit on the PR
id: nrwl-workspace-package-check
Expand Down
Expand Up @@ -5,7 +5,7 @@ name: Renovate Update Integration Tests

on:
pull_request:
branches: [master]
branches: [main]
paths:
- 'package.json'

Expand Down
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -7,9 +7,9 @@
<p align="center">Monorepo for all the tooling which enables ESLint to lint Angular projects</p>

<p align="center">
<a href="https://actions-badge.atrox.dev/angular-eslint/angular-eslint/goto?ref=master"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fangular-eslint%2Fangular-eslint%2Fbadge%3Fref%3Dmaster&style=flat-square" /></a>
<a href="https://actions-badge.atrox.dev/angular-eslint/angular-eslint/goto?ref=main"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fangular-eslint%2Fangular-eslint%2Fbadge%3Fref%3Dmain&style=flat-square" /></a>
<a href="https://www.npmjs.com/package/@angular-eslint/eslint-plugin"><img src="https://img.shields.io/npm/v/@angular-eslint/eslint-plugin/latest.svg?style=flat-square" alt="NPM Version" /></a>
<a href="https://github.com/angular-eslint/angular-eslint/blob/master/LICENSE"><img src="https://img.shields.io/npm/l/@angular-eslint/eslint-plugin.svg?style=flat-square" alt="GitHub license" /></a>
<a href="https://github.com/angular-eslint/angular-eslint/blob/main/LICENSE"><img src="https://img.shields.io/npm/l/@angular-eslint/eslint-plugin.svg?style=flat-square" alt="GitHub license" /></a>
<a href="https://www.npmjs.com/package/@angular-eslint/eslint-plugin"><img src="https://img.shields.io/npm/dm/@angular-eslint/eslint-plugin.svg?style=flat-square" alt="NPM Downloads" /></a>
<a href="https://codecov.io/gh/angular-eslint/angular-eslint"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/angular-eslint/angular-eslint.svg?style=flat-square"></a>
<a href="http://commitizen.github.io/cz-cli/"><img src="https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=flat-square" alt="Commitizen friendly" /></a>
Expand Down Expand Up @@ -110,13 +110,13 @@ Please follow the links below for the packages you care about.

All of the packages are published with the same version number to make it easier to coordinate both releases and installations.

We publish a canary release on every successful merge to master, so **you never need to wait for a new stable version to make use of any updates**.
We publish a canary release on every successful merge to main, so **you never need to wait for a new stable version to make use of any updates**.

The latest version under the `latest` tag is:

<a href="https://www.npmjs.com/package/@angular-eslint/schematics"><img src="https://img.shields.io/npm/v/@angular-eslint/schematics/latest.svg?style=flat-square" alt="NPM Version" /></a>

The latest version under the `canary` tag **(latest commit to master)** is:
The latest version under the `canary` tag **(latest commit to main)** is:

<a href="https://www.npmjs.com/package/@angular-eslint/schematics"><img src="https://img.shields.io/npm/v/@angular-eslint/schematics/canary.svg?style=flat-square" alt="NPM Version" /></a>

Expand Down Expand Up @@ -358,8 +358,8 @@ If you are looking for general help in migrating specific rules from TSLint to E

We have several premade configs within this project which you can extend from (and indeed the configs generated by our schematics do just that). For more information about the configs, check out their READMEs

- Source code: https://github.com/angular-eslint/angular-eslint/blob/master/packages/eslint-plugin/src/configs/README.md
- Templates: https://github.com/angular-eslint/angular-eslint/blob/master/packages/eslint-plugin-template/src/configs/README.md
- Source code: https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/src/configs/README.md
- Templates: https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/src/configs/README.md

## Going fully manual (not recommended)

Expand Down
2 changes: 1 addition & 1 deletion nx.json
Expand Up @@ -59,6 +59,6 @@
]
},
"affected": {
"defaultBase": "master"
"defaultBase": "main"
}
}
Expand Up @@ -33,7 +33,7 @@ patchedRuleCreator.withoutDocs = ESLintUtils.RuleCreator.withoutDocs;

export const createESLintRule = patchedRuleCreator(
(ruleName) =>
`https://github.com/angular-eslint/angular-eslint/blob/master/packages/eslint-plugin-template/docs/rules/${ruleName}.md`,
`https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin-template/docs/rules/${ruleName}.md`,
);

interface ParserServices {
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin/src/utils/create-eslint-rule.ts
Expand Up @@ -28,5 +28,5 @@ patchedRuleCreator.withoutDocs = ESLintUtils.RuleCreator.withoutDocs;

export const createESLintRule = patchedRuleCreator(
(ruleName) =>
`https://github.com/angular-eslint/angular-eslint/blob/master/packages/eslint-plugin/docs/rules/${ruleName}.md`,
`https://github.com/angular-eslint/angular-eslint/blob/main/packages/eslint-plugin/docs/rules/${ruleName}.md`,
);
Expand Up @@ -2,7 +2,7 @@

exports[`v13-new-workspace-create-application-false-ng-add-then-project it should pass linting when adding a project before running ng-add 2`] = `
Object {
"@angular-devkit/build-angular": "^14.0.2",
"@angular-devkit/build-angular": "^14.0.5",
"@angular-eslint/builder": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin-template": "9999.0.1-local-integration-tests",
Expand Down
Expand Up @@ -2,7 +2,7 @@

exports[`v13-new-workspace-create-application-false-project-then-ng-add it should pass linting when ng-add is run before adding a project 2`] = `
Object {
"@angular-devkit/build-angular": "^14.0.2",
"@angular-devkit/build-angular": "^14.0.5",
"@angular-eslint/builder": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin": "9999.0.1-local-integration-tests",
"@angular-eslint/eslint-plugin-template": "9999.0.1-local-integration-tests",
Expand Down

0 comments on commit 8d36232

Please sign in to comment.