diff --git a/.github/workflows/nodejs-ci-action.yml b/.github/workflows/nodejs-ci-action.yml index 8f2afe02..d8f1f3e7 100644 --- a/.github/workflows/nodejs-ci-action.yml +++ b/.github/workflows/nodejs-ci-action.yml @@ -2,9 +2,9 @@ name: Node.js CI on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] jobs: build: diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 46f9842e..934555f6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main name: release-please jobs: release-please: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b5b3496..db35bb8f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -64,7 +64,7 @@ Use `git rebase` to sync your work from time to time. ``` git fetch upstream -git rebase upstream/master +git rebase upstream/main ``` ### Development cycle diff --git a/README.md b/README.md index e8770e3d..92ad30fd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Nodeshift ![Node.js CI](https://github.com/nodeshift/nodeshift/workflows/Node.js%20CI/badge.svg) -[![Coverage Status](https://coveralls.io/repos/github/nodeshift/nodeshift/badge.svg?branch=master)](https://coveralls.io/github/nodeshift/nodeshift?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/nodeshift/nodeshift/badge.svg?branch=main)](https://coveralls.io/github/nodeshift/nodeshift?branch=main) ## What is it diff --git a/docs/assets/anchor.js b/docs/assets/anchor.js index 1f573dcb..b842320d 100644 --- a/docs/assets/anchor.js +++ b/docs/assets/anchor.js @@ -5,7 +5,7 @@ */ /* eslint-env amd, node */ -// https://github.com/umdjs/umd/blob/master/templates/returnExports.js +// https://github.com/umdjs/umd/blob/HEAD/templates/returnExports.js (function (root, factory) { 'use strict'; if (typeof define === 'function' && define.amd) { diff --git a/docs/index.html b/docs/index.html index 5b6e3f58..9ee8df5d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -105,7 +105,7 @@

Nodeshift CircleCI

-

Build Status Coverage Status

+

Build Status Coverage Status

What is it

Nodeshift is an opinionated command line application and programmable API that you can use to deploy Node.js projects to OpenShift.

Prerequisites

diff --git a/test/enricher-tests/git-info-enricher-test.js b/test/enricher-tests/git-info-enricher-test.js index cad550db..0ce112f0 100644 --- a/test/enricher-tests/git-info-enricher-test.js +++ b/test/enricher-tests/git-info-enricher-test.js @@ -60,7 +60,7 @@ test('git-info-enricher - no service or deployment', async (t) => { const gie = proxyquire('../../lib/resource-enrichers/git-info-enricher', { 'git-repo-info': () => { return { - branch: 'master' + branch: 'main' }; } }); @@ -86,7 +86,7 @@ test('git-info-enricher - service', async (t) => { const gie = proxyquire('../../lib/resource-enrichers/git-info-enricher', { 'git-repo-info': () => { return { - branch: 'master', + branch: 'main', sha: 'abcd1234' }; } @@ -97,7 +97,7 @@ test('git-info-enricher - service', async (t) => { t.equal(Array.isArray(list), true, 'should return an array'); t.notEqual(list, resourceList, 'arrays should not be equal'); t.ok(list[0].metadata.annotations, 'annotations'); - t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'master', 'branch prop is master'); + t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'main', 'branch prop is main'); t.equal(list[0].metadata.annotations['nodeshift/git-commit'], 'abcd1234', 'commit prop is abcd1234'); t.end(); }); @@ -122,7 +122,7 @@ test('git-info-enricher - deploymentConfig', async (t) => { const gie = proxyquire('../../lib/resource-enrichers/git-info-enricher', { 'git-repo-info': () => { return { - branch: 'master', + branch: 'main', sha: 'abcd1234' }; } @@ -133,10 +133,10 @@ test('git-info-enricher - deploymentConfig', async (t) => { t.equal(Array.isArray(list), true, 'should return an array'); t.notEqual(list, resourceList, 'arrays should not be equal'); t.ok(list[0].metadata.annotations, 'annotations'); - t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'master', 'branch prop is master'); + t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'main', 'branch prop is main'); t.equal(list[0].metadata.annotations['nodeshift/git-commit'], 'abcd1234', 'commit prop is abcd1234'); t.ok(list[0].spec.template.metadata.annotations, 'annotations'); - t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-branch'], 'master', 'branch prop is master'); + t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-branch'], 'main', 'branch prop is main'); t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-commit'], 'abcd1234', 'commit prop is abcd1234'); t.end(); }); @@ -167,7 +167,7 @@ test('git-info-enricher - deploymentConfig - merge test', async (t) => { const gie = proxyquire('../../lib/resource-enrichers/git-info-enricher', { 'git-repo-info': () => { return { - branch: 'master', + branch: 'main', sha: 'abcd1234' }; } @@ -178,11 +178,11 @@ test('git-info-enricher - deploymentConfig - merge test', async (t) => { t.equal(Array.isArray(list), true, 'should return an array'); t.notEqual(list, resourceList, 'arrays should not be equal'); t.ok(list[0].metadata.annotations, 'annotations'); - t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'master', 'branch prop is master'); + t.equal(list[0].metadata.annotations['nodeshift/git-branch'], 'main', 'branch prop is main'); t.equal(list[0].metadata.annotations['nodeshift/git-commit'], 'abcd1234', 'commit prop is abcd1234'); t.equal(list[0].metadata.annotations.key, 'value', 'commit prop is abcd1234'); t.ok(list[0].spec.template.metadata.annotations, 'annotations'); - t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-branch'], 'master', 'branch prop is master'); + t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-branch'], 'main', 'branch prop is main'); t.equal(list[0].spec.template.metadata.annotations['nodeshift/git-commit'], 'abcd1234', 'commit prop is abcd1234'); t.equal(list[0].spec.template.metadata.annotations.key, 'value', 'commit prop is abcd1234'); t.end();