Skip to content

Commit

Permalink
Update "master" branch references to "main"
Browse files Browse the repository at this point in the history
Update "master" branch references to "main".

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
denyeart committed Mar 22, 2021
1 parent c1ec01f commit ea8da64
Show file tree
Hide file tree
Showing 19 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ repository:
description: Hyperledger Fabric Node.js Smart Contracts issues in JIRA please
https://jira.hyperledger.org
homepage: https://wiki.hyperledger.org/display/fabric
default_branch: master
default_branch: main
has_downloads: true
has_issues: false
has_projects: false
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/)

> 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`
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.
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.

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.

Expand All @@ -50,8 +50,8 @@ For more specific purposes during development the following are useful:
* `rush publish --include-all --pack --release-folder ./tarballs --publish`
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
* `rush rebuild --to fvtests` to run the unit tests for the core modules, but not the docker or jsdoc
* `rush rebuild --to fabric-contract-api` to build, lint and run just the `fabric-contract-api`
* `rush logs` will show the location of all the log files
* `rush rebuild --to fabric-contract-api` to build, lint and run just the `fabric-contract-api`
* `rush logs` will show the location of all the log files

To clean up docker

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

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

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

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

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

<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>.
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Maintainers
| James Taylor | [jt-nti][jt-nti] | jtonline | <jamest@uk.ibm.com>
| Chaoyi Zhao | [zhaochy1990][zhaochy1990] | zhaochy | <zhaochy_2015@hotmail.com>

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

<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>.

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Hyperledger Fabric - Node.js Contracts

[![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)
[![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)
[![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)
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
[![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)
[![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)
[![Rocket.Chat](https://chat.hyperledger.org/images/join-chat.svg)](https://chat.hyperledger.org/channel/fabric-chaincode-dev)

This is the project to support the writing of Contracts with the node.js runtime.
This is the project to support the writing of Contracts with the node.js runtime.

## Documentation

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

## npm Shrinkwrap

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.
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.

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.
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.

## Contributing

Expand All @@ -41,4 +41,4 @@ There is also a [release guide](RELEASING.md) describing the process for publish
Hyperledger Project source code files are made available under the Apache
License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file.
Hyperledger Project documentation files are made available under the Creative
Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
4 changes: 2 additions & 2 deletions apis/fabric-contract-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ npm install --save fabric-shim
```

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

Expand Down Expand Up @@ -124,7 +124,7 @@ shim.start(new Chaincode());
```

### API Reference
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.
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.



Expand Down
2 changes: 1 addition & 1 deletion apis/fabric-contract-api/test/unit/metadata.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://hyperledger.github.io/fabric-chaincode-node/master/api/contract-schema.json",
"$schema": "https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json",
"contracts": {
"ShippingContract": {
"name": "ShippingContract",
Expand Down
22 changes: 11 additions & 11 deletions ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ schedules:
displayName: 'Chaincode Node Nightly Driver'
branches:
include:
- master
- main

# Trigger on the master branch
# Trigger on the main branch
# Standard Pull Request and Merge builds
# Any git tag will also trigger a build that should do publishing
trigger:
branches:
include:
- 'master'
- 'main'
tags:
include:
- '*'
Expand Down Expand Up @@ -145,12 +145,12 @@ stages:
path: $(Build.SourcesDirectory)/build
- script: |
set -ev
./tools/getEdgeDocker.sh # essential to get master docker images of peer etc.
./tools/getEdgeDocker.sh # essential to get main docker images of peer etc.
docker image load --input build/fabric-nodeenv.tar.gz # gets the build image of nodeenv
docker images
node common/scripts/install-run-rush.js install
node common/scripts/install-run-rush.js update # should the tests need 'building' this will need to go here
displayName: 'Get the latest master docker images'
displayName: 'Get the latest main docker images'
- script: |
set -ev
export TLS=true
Expand Down Expand Up @@ -224,9 +224,9 @@ stages:
dependsOn: displayenv
condition: and(succeeded(),eq(variables['Build.Reason'], 'IndividualCI'))
variables:
${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}:
jsdoc_release: master
${{ if ne(variables['Build.SourceBranch'], 'refs/heads/master') }}:
${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
jsdoc_release: main
${{ if ne(variables['Build.SourceBranch'], 'refs/heads/main') }}:
jsdoc_release: $[format('release-{0}',dependencies.displayenv.outputs['BuildData.MINOR_PACKAGE_VERSION'])]
steps:
- task: NodeTool@0
Expand All @@ -249,7 +249,7 @@ stages:
cleanTargetFolder: true
displayName: 'Copy JSDoc'
- task: CopyFiles@2
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
inputs:
contents: |
_config.yml
Expand All @@ -261,7 +261,7 @@ stages:
sourceFolder: '$(Build.SourcesDirectory)/docs'
targetFolder: $(Build.ArtifactStagingDirectory)/gh-pages
cleanTargetFolder: true
displayName: 'Copy gh-pages doc (master branch only)'
displayName: 'Copy gh-pages doc (main branch only)'
- script: |
git reset --hard HEAD
git clean -xdf
Expand All @@ -273,7 +273,7 @@ stages:
rm -rf $(jsdoc_release)/api/*
cp -r $(Build.ArtifactStagingDirectory)/jsdoc/gen/* $(jsdoc_release)/api
if [ -d $(Build.ArtifactStagingDirectory)/gh-pages ]; then
find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'master' -o -name 'release-*' \) -exec rm -rf {} \;
find . -maxdepth 1 ! \( -name [.]* -o -name 'gh-pages' -o -name 'main' -o -name 'release-*' \) -exec rm -rf {} \;
cp -r $(Build.ArtifactStagingDirectory)/gh-pages/* .
fi
displayName: 'Update gh-pages branch'
Expand Down
4 changes: 2 additions & 2 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
{
"commandKind": "global",
"name": "edge-docker",
"summary": "Gets the latest master docker images for Fabric ",
"description": "Run this command before doing anything to get the master branch Fabric docker images",
"summary": "Gets the latest main docker images for Fabric ",
"description": "Run this command before doing anything to get the main branch Fabric docker images",
"shellCommand": "./tools/getEdgeDocker.sh"
}
]
Expand Down
4 changes: 2 additions & 2 deletions docs/_jsdoc/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![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)
[![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)
[![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)
[![fabric-shim npm module](https://img.shields.io/npm/v/fabric-shim?label=fabric-shim)](https://www.npmjs.com/package/fabric-shim)
[![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)
Expand Down Expand Up @@ -91,7 +91,7 @@ npm install --save fabric-shim
```

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

Expand Down
Loading

0 comments on commit ea8da64

Please sign in to comment.