From abb6c3dbceaaff63cdfb9c29a90a9108d95d8352 Mon Sep 17 00:00:00 2001 From: Brandon Mills Date: Wed, 25 Nov 2020 23:49:38 -0500 Subject: [PATCH 1/2] Chore: Switch to main for primary branch (fixes #161) The only remaining string search results for "master" are URLs to other repositories. --- .github/workflows/ci.yml | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cd4732e..65c5720f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: lint: diff --git a/README.md b/README.md index 35dd14c6..0a487fde 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # eslint-plugin-markdown [![npm Version](https://img.shields.io/npm/v/eslint-plugin-markdown.svg)](https://www.npmjs.com/package/eslint-plugin-markdown) -[![Build Status](https://img.shields.io/github/workflow/status/eslint/eslint-plugin-markdown/CI/master.svg)](https://github.com/eslint/eslint-plugin-markdown/actions) +[![Build Status](https://img.shields.io/github/workflow/status/eslint/eslint-plugin-markdown/CI/main.svg)](https://github.com/eslint/eslint-plugin-markdown/actions) Lint JS, JSX, TypeScript, and more inside Markdown. @@ -12,7 +12,7 @@ Lint JS, JSX, TypeScript, and more inside Markdown. alt="A JS code snippet in a Markdown editor has red squiggly underlines. A tooltip explains the problem." /> -> 🚧 This documentation is for an unfinished v2 release in progress in the `master` branch. The latest stable documentation is in the [`v1` branch](https://github.com/eslint/eslint-plugin-markdown/tree/v1). +> 🚧 This documentation is for an unfinished v2 release in progress in the `main` branch. The latest stable documentation is in the [`v1` branch](https://github.com/eslint/eslint-plugin-markdown/tree/v1). ## Usage From 4ac05d5b73627e42ada761ca3a24d349f4e62b35 Mon Sep 17 00:00:00 2001 From: Brandon Mills Date: Sat, 28 Nov 2020 13:05:29 -0500 Subject: [PATCH 2/2] Chore: Use latest eslint-release This should allow releasing from the `main` branch, which was part of the 3.1 release. The breaking changes in v2 and v3 dropped support for older Node versions on the release server. Since it's working in other eslint org packages, that's not a concern. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1066683d..d65086c9 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "eslint-config-eslint": "^6.0.0", "eslint-plugin-jsdoc": "^15.9.5", "eslint-plugin-node": "^9.0.0", - "eslint-release": "^1.2.0", + "eslint-release": "^3.1.2", "mocha": "^6.2.2", "nyc": "^14.1.1" },