Skip to content

Commit

Permalink
chore: move to main for primary branch (#552)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Dawson <mdawson@devrus.com>
  • Loading branch information
mhdawson committed Mar 15, 2021
1 parent b684a2a commit d7d6ebb
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nodejs-ci-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Node.js CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
push:
branches:
- master
- main
name: release-please
jobs:
release-please:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/assets/anchor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ <h2 id='readme' class='mt0'>


<h1>Nodeshift <a href="https://circleci.com/gh/nodeshift/nodeshift"><img src="https://circleci.com/gh/nodeshift/nodeshift.svg?style=svg" alt="CircleCI"></a></h1>
<p><a href="https://travis-ci.org/nodeshift/nodeshift"><img src="https://travis-ci.org/nodeshift/nodeshift.svg?branch=master" alt="Build Status"></a> <a href="https://coveralls.io/github/nodeshift/nodeshift?branch=master"><img src="https://coveralls.io/repos/github/nodeshift/nodeshift/badge.svg?branch=master" alt="Coverage Status"></a></p>
<p><a href="https://travis-ci.org/nodeshift/nodeshift"><img src="https://travis-ci.org/nodeshift/nodeshift.svg?branch=main" alt="Build Status"></a> <a href="https://coveralls.io/github/nodeshift/nodeshift?branch=main"><img src="https://coveralls.io/repos/github/nodeshift/nodeshift/badge.svg?branch=main" alt="Coverage Status"></a></p>
<h2>What is it</h2>
<p>Nodeshift is an opinionated command line application and programmable API that you can use to deploy Node.js projects to OpenShift.</p>
<h2>Prerequisites</h2>
Expand Down
18 changes: 9 additions & 9 deletions test/enricher-tests/git-info-enricher-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
};
}
});
Expand All @@ -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'
};
}
Expand All @@ -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();
});
Expand All @@ -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'
};
}
Expand All @@ -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();
});
Expand Down Expand Up @@ -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'
};
}
Expand All @@ -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();
Expand Down

0 comments on commit d7d6ebb

Please sign in to comment.