From 1ba1e95cf29d9777817afa645ea134573e23fbf2 Mon Sep 17 00:00:00 2001 From: Jonathan Clem Date: Tue, 14 Jul 2020 16:36:10 -0400 Subject: [PATCH] Replace default branch name with `main` --- .github/workflows/ci.yml | 4 ++-- .github/workflows/integration.yml | 4 ++-- .github/workflows/pull-request-test.yml | 2 +- README.md | 6 +++--- docs/development.md | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97bf123..33577e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ on: - push: {branches: master} - pull_request: {branches: master} + push: {branches: main} + pull_request: {branches: main} jobs: ci: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index b43f4e7..5f59f33 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -1,12 +1,12 @@ on: - push: {branches: master} + push: {branches: main} jobs: integration: runs-on: ubuntu-latest steps: - id: output-set - uses: actions/github-script@master + uses: actions/github-script@main with: script: return core.getInput('input-value') result-encoding: string diff --git a/.github/workflows/pull-request-test.yml b/.github/workflows/pull-request-test.yml index 7d3df41..7e5f733 100644 --- a/.github/workflows/pull-request-test.yml +++ b/.github/workflows/pull-request-test.yml @@ -1,6 +1,6 @@ on: pull_request: - branches: master + branches: main types: [opened, synchronize] jobs: diff --git a/README.md b/README.md index 9517134..007a154 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ arguments will be provided: - `github` A pre-authenticated [octokit/rest.js](https://github.com/octokit/rest.js) client - `context` An object containing the [context of the workflow - run](https://github.com/actions/toolkit/blob/master/packages/github/src/context.ts) -- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/master/packages/core) package -- `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/master/packages/io) package + run](https://github.com/actions/toolkit/blob/main/packages/github/src/context.ts) +- `core` A reference to the [@actions/core](https://github.com/actions/toolkit/tree/main/packages/core) package +- `io` A reference to the [@actions/io](https://github.com/actions/toolkit/tree/main/packages/io) package Since the `script` is just a function body, these values will already be defined, so you don't have to (see examples below). diff --git a/docs/development.md b/docs/development.md index 68352e8..2938fdb 100644 --- a/docs/development.md +++ b/docs/development.md @@ -25,4 +25,4 @@ Releases are done manually, for now: 1. Ensure that the build is up to date with `npm run build`. 1. Bump the [package.json](/package.json#L3) and [package-lock.json](/package-lock.json#L3) version numbers and commit them. 1. Update documentation (including updated version numbers). -1. Tag master with the new version number and create a GitHub release. +1. Tag main with the new version number and create a GitHub release.