diff options
| -rw-r--r-- | .github/workflows/test.yml | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | __test__/git-auth-helper.test.ts | 2 | ||||
| -rwxr-xr-x | __test__/verify-basic.sh | 2 | ||||
| -rw-r--r-- | adrs/0153-checkout-v2.md | 4 | ||||
| -rw-r--r-- | dist/index.js | 4 | ||||
| -rw-r--r-- | src/git-command-manager.ts | 2 | ||||
| -rw-r--r-- | src/input-helper.ts | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9515999..87360d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main - releases/* jobs: @@ -204,7 +204,7 @@ Refer [here](https://github.com/actions/checkout/blob/v1/README.md) for previous ```yaml on: pull_request: - branches: [master] + branches: [main] types: [opened, synchronize, closed] jobs: build: diff --git a/__test__/git-auth-helper.test.ts b/__test__/git-auth-helper.test.ts index e4e640c..2b4830c 100644 --- a/__test__/git-auth-helper.test.ts +++ b/__test__/git-auth-helper.test.ts @@ -764,7 +764,7 @@ async function setup(testName: string): Promise<void> { submodules: false, nestedSubmodules: false, persistCredentials: true, - ref: 'refs/heads/master', + ref: 'refs/heads/main', repositoryName: 'my-repo', repositoryOwner: 'my-org', repositoryPath: '', diff --git a/__test__/verify-basic.sh b/__test__/verify-basic.sh index aedd66d..5aaa309 100755 --- a/__test__/verify-basic.sh +++ b/__test__/verify-basic.sh @@ -20,5 +20,5 @@ else # Verify auth token cd basic - git fetch --no-tags --depth=1 origin +refs/heads/master:refs/remotes/origin/master + git fetch --no-tags --depth=1 origin +refs/heads/main:refs/remotes/origin/main fi diff --git a/adrs/0153-checkout-v2.md b/adrs/0153-checkout-v2.md index f174b1a..74730c7 100644 --- a/adrs/0153-checkout-v2.md +++ b/adrs/0153-checkout-v2.md @@ -24,7 +24,7 @@ We want to take this opportunity to make behavioral changes, from v1. This docum description: > The branch, tag or SHA to checkout. When checking out the repository that triggered a workflow, this defaults to the reference or SHA for that - event. Otherwise, defaults to `master`. + event. Otherwise, uses the default branch. token: description: > Personal access token (PAT) used to fetch the repository. The PAT is configured @@ -277,7 +277,7 @@ Note: ### Branching strategy and release tags - Create a servicing branch for V1: `releases/v1` -- Merge the changes into `master` +- Merge the changes into the default branch - Release using a new tag `preview` - When stable, release using a new tag `v2` diff --git a/dist/index.js b/dist/index.js index e0d0238..ae64f3f 100644 --- a/dist/index.js +++ b/dist/index.js @@ -5900,7 +5900,7 @@ class GitCommandManager { /** * Resolves a ref to a SHA. For a branch or lightweight tag, the commit SHA is returned. * For an annotated tag, the tag SHA is returned. - * @param {string} ref For example: 'refs/heads/master' or '/refs/tags/v1' + * @param {string} ref For example: 'refs/heads/main' or '/refs/tags/v1' * @returns {Promise<string>} */ revParse(ref) { @@ -14545,7 +14545,7 @@ function getInputs() { result.ref = github.context.ref; result.commit = github.context.sha; // Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event), - // the ref is unqualifed like "master" instead of "refs/heads/master". + // the ref is unqualifed like "main" instead of "refs/heads/main". if (result.commit && result.ref && !result.ref.startsWith('refs/')) { result.ref = `refs/heads/${result.ref}`; } diff --git a/src/git-command-manager.ts b/src/git-command-manager.ts index 8bf3aa1..059e3d8 100644 --- a/src/git-command-manager.ts +++ b/src/git-command-manager.ts @@ -270,7 +270,7 @@ class GitCommandManager { /** * Resolves a ref to a SHA. For a branch or lightweight tag, the commit SHA is returned. * For an annotated tag, the tag SHA is returned. - * @param {string} ref For example: 'refs/heads/master' or '/refs/tags/v1' + * @param {string} ref For example: 'refs/heads/main' or '/refs/tags/v1' * @returns {Promise<string>} */ async revParse(ref: string): Promise<string> { diff --git a/src/input-helper.ts b/src/input-helper.ts index eabb9e0..4c05d6e 100644 --- a/src/input-helper.ts +++ b/src/input-helper.ts @@ -63,7 +63,7 @@ export function getInputs(): IGitSourceSettings { result.commit = github.context.sha // Some events have an unqualifed ref. For example when a PR is merged (pull_request closed event), - // the ref is unqualifed like "master" instead of "refs/heads/master". + // the ref is unqualifed like "main" instead of "refs/heads/main". if (result.commit && result.ref && !result.ref.startsWith('refs/')) { result.ref = `refs/heads/${result.ref}` } |