Skip to content

Commit ea8da64

Browse files
committed
Update "master" branch references to "main"
Update "master" branch references to "main". Signed-off-by: David Enyeart <enyeart@us.ibm.com>
1 parent c1ec01f commit ea8da64

File tree

19 files changed

+72
-72
lines changed

19 files changed

+72
-72
lines changed

.github/settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ repository:
33
description: Hyperledger Fabric Node.js Smart Contracts issues in JIRA please
44
https://jira.hyperledger.org
55
homepage: https://wiki.hyperledger.org/display/fabric
6-
default_branch: master
6+
default_branch: main
77
has_downloads: true
88
has_issues: false
99
has_projects: false

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/)
2727

2828
> Note that npm v6 has some bugs that mean adding new dependencies etc are not properly picked up. Longer term we should consider moving to yarn or pnpm. However in practice this isn't a serious problem and has been possible to be worked around by issuing `rm ./common/config/rush/npm-shrinkwrap.json` and then `rush update`
2929
30-
The fv and e2e tests require a set of docker images of Fabric Peers, Orderers and CAs. To ensure you have the correct images ensure these have been dowloaded and tagged. `rush edge-docker` will do this for you.
30+
The fv and e2e tests require a set of docker images of Fabric Peers, Orderers and CAs. To ensure you have the correct images ensure these have been dowloaded and tagged. `rush edge-docker` will do this for you.
3131

3232
They also need to have the `nodeenv` image present - this is build as part of the `rush rebuild` so please ensure this has been run first. It is advisable to clean up the docker containers and images between test runs to avoid any odd behaviour. Commands to help do this are below.
3333

@@ -50,8 +50,8 @@ For more specific purposes during development the following are useful:
5050
* `rush publish --include-all --pack --release-folder ./tarballs --publish`
5151
If you want to get a set of `.tar.gz` files of the node modules to use for local testing this command will put them into the `tarballs` directory
5252
* `rush rebuild --to fvtests` to run the unit tests for the core modules, but not the docker or jsdoc
53-
* `rush rebuild --to fabric-contract-api` to build, lint and run just the `fabric-contract-api`
54-
* `rush logs` will show the location of all the log files
53+
* `rush rebuild --to fabric-contract-api` to build, lint and run just the `fabric-contract-api`
54+
* `rush logs` will show the location of all the log files
5555

5656
To clean up docker
5757

@@ -67,10 +67,10 @@ The codebase is maintained in [github](https://github.com/hyperledger/fabric-cha
6767

6868
## Code of Conduct Guidelines <a name="conduct"></a>
6969

70-
See our [Code of Conduct Guidelines](../blob/master/CODE_OF_CONDUCT.md).
70+
See our [Code of Conduct Guidelines](../blob/main/CODE_OF_CONDUCT.md).
7171

7272
## Maintainers <a name="maintainers"></a>
7373

74-
Should you have any questions or concerns, please reach out to one of the project's [Maintainers](../blob/master/MAINTAINERS.md).
74+
Should you have any questions or concerns, please reach out to one of the project's [Maintainers](../blob/main/MAINTAINERS.md).
7575

7676
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Maintainers
1010
| James Taylor | [jt-nti][jt-nti] | jtonline | <jamest@uk.ibm.com>
1111
| Chaoyi Zhao | [zhaochy1990][zhaochy1990] | zhaochy | <zhaochy_2015@hotmail.com>
1212

13-
Also: Please see the [Release Manager section](https://github.com/hyperledger/fabric/blob/master/MAINTAINERS.md)
13+
Also: Please see the [Release Manager section](https://github.com/hyperledger/fabric/blob/main/MAINTAINERS.md)
1414

1515
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
1616

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Hyperledger Fabric - Node.js Contracts
22

3-
[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_apis/build/status/Fabric-Chaincode-Node?branchName=master)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_build/latest?definitionId=33&branchName=master)
3+
[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_apis/build/status/Fabric-Chaincode-Node?branchName=main)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_build/latest?definitionId=33&branchName=main)
44
[![fabric-contract-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-contract-api)](https://www.npmjs.com/package/fabric-contract-api)
55
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
66
[![fabric-shim-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-api)](https://www.npmjs.com/package/fabric-shim-api)
77
[![fabric-shim-crypto npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-crypto)](https://www.npmjs.com/package/fabric-shim-crypto)
88
[![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-chaincode-dev)
99

10-
This is the project to support the writing of Contracts with the node.js runtime.
10+
This is the project to support the writing of Contracts with the node.js runtime.
1111

1212
## Documentation
1313

@@ -24,9 +24,9 @@ For details on what Nodejs runtime and versions of Hyperledger Fabric can be use
2424

2525
## npm Shrinkwrap
2626

27-
In line with the advice from [npm on shrinkwrap](https://docs.npmjs.com/files/shrinkwrap.json#description) the modules published do not contain a `npm-shrinkwrap.json` file.
27+
In line with the advice from [npm on shrinkwrap](https://docs.npmjs.com/files/shrinkwrap.json#description) the modules published do not contain a `npm-shrinkwrap.json` file.
2828

29-
It is **STRONGLY** recommended therefore that after testing, and before putting your contract into production a `npm-shrinkwrap.json` file is created. When the chaincode is install it will be via a `npm install --production` command.
29+
It is **STRONGLY** recommended therefore that after testing, and before putting your contract into production a `npm-shrinkwrap.json` file is created. When the chaincode is install it will be via a `npm install --production` command.
3030

3131
## Contributing
3232

@@ -41,4 +41,4 @@ There is also a [release guide](RELEASING.md) describing the process for publish
4141
Hyperledger Project source code files are made available under the Apache
4242
License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file.
4343
Hyperledger Project documentation files are made available under the Creative
44-
Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
44+
Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.

apis/fabric-contract-api/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ npm install --save fabric-shim
8989
```
9090

9191
### Usage
92-
The [chaincode interface](https://hyperledger.github.io/fabric-chaincode-node/master/api/fabric-shim.ChaincodeInterface.html) contains two methods to be implemented:
92+
The [chaincode interface](https://hyperledger.github.io/fabric-chaincode-node/main/api/fabric-shim.ChaincodeInterface.html) contains two methods to be implemented:
9393
```javascript
9494
const shim = require('fabric-shim');
9595

@@ -124,7 +124,7 @@ shim.start(new Chaincode());
124124
```
125125

126126
### API Reference
127-
Visit [API Reference](https://hyperledger.github.io/fabric-chaincode-node/master/api/) and click on "Classes" link in the navigation bar on the top to view the list of class APIs.
127+
Visit [API Reference](https://hyperledger.github.io/fabric-chaincode-node/main/api/) and click on "Classes" link in the navigation bar on the top to view the list of class APIs.
128128

129129

130130

apis/fabric-contract-api/test/unit/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://hyperledger.github.io/fabric-chaincode-node/master/api/contract-schema.json",
2+
"$schema": "https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json",
33
"contracts": {
44
"ShippingContract": {
55
"name": "ShippingContract",

ci/azure-pipelines.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ schedules:
1313
displayName: 'Chaincode Node Nightly Driver'
1414
branches:
1515
include:
16-
- master
16+
- main
1717

18-
# Trigger on the master branch
18+
# Trigger on the main branch
1919
# Standard Pull Request and Merge builds
2020
# Any git tag will also trigger a build that should do publishing
2121
trigger:
2222
branches:
2323
include:
24-
- 'master'
24+
- 'main'
2525
tags:
2626
include:
2727
- '*'
@@ -145,12 +145,12 @@ stages:
145145
path: $(Build.SourcesDirectory)/build
146146
- script: |
147147
set -ev
148-
./tools/getEdgeDocker.sh # essential to get master docker images of peer etc.
148+
./tools/getEdgeDocker.sh # essential to get main docker images of peer etc.
149149
docker image load --input build/fabric-nodeenv.tar.gz # gets the build image of nodeenv
150150
docker images
151151
node common/scripts/install-run-rush.js install
152152
node common/scripts/install-run-rush.js update # should the tests need 'building' this will need to go here
153-
displayName: 'Get the latest master docker images'
153+
displayName: 'Get the latest main docker images'
154154
- script: |
155155
set -ev
156156
export TLS=true
@@ -224,9 +224,9 @@ stages:
224224
dependsOn: displayenv
225225
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
226226
variables:
227-
${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
228-
jsdoc_release: master
229-
${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
227+
${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
228+
jsdoc_release: main
229+
${{ if ne(variables['Build.SourceBranch'], 'refs/heads/main') }}:
230230
jsdoc_release: $[format('release-{0}',dependencies.displayenv.outputs['BuildData.MINOR_PACKAGE_VERSION'])]
231231
steps:
232232
- task: NodeTool@0
@@ -249,7 +249,7 @@ stages:
249249
cleanTargetFolder: true
250250
displayName: 'Copy JSDoc'
251251
- task: CopyFiles@2
252-
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
252+
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
253253
inputs:
254254
contents: |
255255
_config.yml
@@ -261,7 +261,7 @@ stages:
261261
sourceFolder: '$(Build.SourcesDirectory)/docs'
262262
targetFolder: $(Build.ArtifactStagingDirectory)/gh-pages
263263
cleanTargetFolder: true
264-
displayName: 'Copy gh-pages doc (master branch only)'
264+
displayName: 'Copy gh-pages doc (main branch only)'
265265
- script: |
266266
git reset --hard HEAD
267267
git clean -xdf
@@ -273,7 +273,7 @@ stages:
273273
rm -rf $(jsdoc_release)/api/*
274274
cp -r $(Build.ArtifactStagingDirectory)/jsdoc/gen/* $(jsdoc_release)/api
275275
if [ -d $(Build.ArtifactStagingDirectory)/gh-pages ]; then
276-
find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'master' -o -name 'release-*' \) -exec rm -rf {} \;
276+
find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'main' -o -name 'release-*' \) -exec rm -rf {} \;
277277
cp -r $(Build.ArtifactStagingDirectory)/gh-pages/* .
278278
fi
279279
displayName: 'Update gh-pages branch'

common/config/rush/command-line.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
{
8080
"commandKind": "global",
8181
"name": "edge-docker",
82-
"summary": "Gets the latest master docker images for Fabric ",
83-
"description": "Run this command before doing anything to get the master branch Fabric docker images",
82+
"summary": "Gets the latest main docker images for Fabric ",
83+
"description": "Run this command before doing anything to get the main branch Fabric docker images",
8484
"shellCommand": "./tools/getEdgeDocker.sh"
8585
}
8686
]

docs/_jsdoc/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_apis/build/status/Fabric-Chaincode-Node?branchName=master)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_build/latest?definitionId=33&branchName=master)
1+
[![Build Status](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_apis/build/status/Fabric-Chaincode-Node?branchName=main)](https://dev.azure.com/Hyperledger/Fabric-Chaincode-Node/_build/latest?definitionId=33&branchName=main)
22
[![fabric-contract-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-contract-api)](https://www.npmjs.com/package/fabric-contract-api)
33
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
44
[![fabric-shim-api npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim-api)](https://www.npmjs.com/package/fabric-shim-api)
@@ -91,7 +91,7 @@ npm install --save fabric-shim
9191
```
9292

9393
### Usage
94-
The [chaincode interface](https://hyperledger.github.io/fabric-chaincode-node/master/api/fabric-shim.ChaincodeInterface.html) contains two methods to be implemented:
94+
The [chaincode interface](https://hyperledger.github.io/fabric-chaincode-node/main/api/fabric-shim.ChaincodeInterface.html) contains two methods to be implemented:
9595
```javascript
9696
const shim = require('fabric-shim');
9797

0 commit comments

Comments
 (0)