-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(build,doc): updating default branch to develop (#167)
* updating default branch to develop * push images to ghcr Signed-off-by: mayank <[email protected]>
- Loading branch information
Showing
11 changed files
with
59 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| ## Community Code of Conduct | ||
|
|
||
| This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). | ||
| This project follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/HEAD/code-of-conduct.md). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| This is a OpenEBS sub project and abides by the | ||
| [OpenEBS Project Governance](https://github.com/openebs/openebs/blob/master/GOVERNANCE.md). | ||
| [OpenEBS Project Governance](https://github.com/openebs/openebs/blob/HEAD/GOVERNANCE.md). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| ## Sign your commits | ||
|
|
||
| We use the Developer Certificate of Origin (DCO) as an additional safeguard for the OpenEBS projects. This is a well established and widely used mechanism to assure that contributors have confirmed their right to license their contribution under the project's license. Please read [dcofile](https://github.com/openebs/openebs/blob/master/contribute/developer-certificate-of-origin). If you can certify it, then just add a line to every git commit message: | ||
| We use the Developer Certificate of Origin (DCO) as an additional safeguard for the OpenEBS projects. This is a well established and widely used mechanism to assure that contributors have confirmed their right to license their contribution under the project's license. Please read [dcofile](https://github.com/openebs/openebs/blob/HEAD/contribute/developer-certificate-of-origin). If you can certify it, then just add a line to every git commit message: | ||
|
|
||
| ```` | ||
| Signed-off-by: Random J Developer <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ | |
|
|
||
| * You have Go 1.14 installed on your local development machine. | ||
| * You have Docker installed on your local development machine. Docker is required for building velero-plugin container images and to push them into a Kubernetes cluster for testing. | ||
| * You have `kubectl` installed. For running integration tests, you will require an existing single node cluster with [openebs](https://blog.openebs.io/how-to-install-openebs-with-kubernetes-using-minikube-2ed488dff1c2) and [velero](https://velero.io/docs/master/basic-install/) installed. Don't worry if you don't have access to the Kubernetes cluster, raising a PR with the velero-plugin repository will run integration tests for your changes against a Minikube cluster. | ||
| * You have `kubectl` installed. For running integration tests, you will require an existing single node cluster with [openebs](https://blog.openebs.io/how-to-install-openebs-with-kubernetes-using-minikube-2ed488dff1c2) and [velero](https://velero.io/docs/main/basic-install/) installed. Don't worry if you don't have access to the Kubernetes cluster, raising a PR with the velero-plugin repository will run integration tests for your changes against a Minikube cluster. | ||
|
|
||
| ## Initial Setup | ||
|
|
||
|
|
@@ -31,7 +31,7 @@ git clone https://github.com/$user/velero-plugin.git | |
| cd $GOPATH/src/github.com/openebs/velero-plugin | ||
| git remote add upstream https://github.com/openebs/velero-plugin.git | ||
|
|
||
| # Never push to upstream master | ||
| # Never push to upstream develop | ||
| git remote set-url --push upstream no_push | ||
|
|
||
| # Confirm that your remotes make sense: | ||
|
|
@@ -74,15 +74,15 @@ Open a terminal on your local machine. Change directory to the velero-plugin for | |
| cd $GOPATH/src/github.com/openebs/velero-plugin | ||
| ``` | ||
|
|
||
| Check out the master branch. | ||
| Check out the develop branch. | ||
|
|
||
| ```sh | ||
| $ git checkout master | ||
| Switched to branch 'master' | ||
| Your branch is up-to-date with 'origin/master'. | ||
| $ git checkout develop | ||
| Switched to branch 'develop' | ||
| Your branch is up-to-date with 'origin/develop'. | ||
| ``` | ||
|
|
||
| Recall that origin/master is a branch on your remote GitHub repository. | ||
| Recall that origin/develop is a branch on your remote GitHub repository. | ||
| Make sure you have the upstream remote openebs/velero-plugin by listing them. | ||
|
|
||
| ```sh | ||
|
|
@@ -99,62 +99,62 @@ cd $GOPATH/src/github.com/openebs/velero-plugin | |
| git remote add upstream https://github.com/openebs/velero-plugin.git | ||
| ``` | ||
|
|
||
| Fetch all the changes from the upstream master branch. | ||
| Fetch all the changes from the upstream develop branch. | ||
|
|
||
| ```sh | ||
| $ git fetch upstream master | ||
| $ git fetch upstream develop | ||
| remote: Counting objects: 141, done. | ||
| remote: Compressing objects: 100% (29/29), done. | ||
| remote: Total 141 (delta 52), reused 46 (delta 46), pack-reused 66 | ||
| Receiving objects: 100% (141/141), 112.43 KiB | 0 bytes/s, done. | ||
| Resolving deltas: 100% (79/79), done. | ||
| From github.com:openebs/velero-plugin | ||
| * branch master -> FETCH_HEAD | ||
| * branch develop -> FETCH_HEAD | ||
| ``` | ||
|
|
||
| Rebase your local master with the upstream/master. | ||
| Rebase your local develop with the upstream/develop. | ||
|
|
||
| ```sh | ||
| $ git rebase upstream/master | ||
| $ git rebase upstream/develop | ||
| First, rewinding head to replay your work on top of it... | ||
| Fast-forwarded master to upstream/master. | ||
| Fast-forwarded develop to upstream/develop. | ||
| ``` | ||
|
|
||
| This command applies all the commits from the upstream master to your local master. | ||
| This command applies all the commits from the upstream develop to your local develop. | ||
|
|
||
| Check the status of your local branch. | ||
|
|
||
| ```sh | ||
| $ git status | ||
| On branch master | ||
| Your branch is ahead of 'origin/master' by 12 commits. | ||
| On branch develop | ||
| Your branch is ahead of 'origin/develop' by 12 commits. | ||
| (use "git push" to publish your local commits) | ||
| nothing to commit, working directory clean | ||
| ``` | ||
|
|
||
| Your local repository now has all the changes from the upstream remote. You need to push the changes to your remote fork which is origin master. | ||
| Your local repository now has all the changes from the upstream remote. You need to push the changes to your remote fork which is origin develop. | ||
|
|
||
| Push the rebased master to origin master. | ||
| Push the rebased develop to origin develop. | ||
|
|
||
| ```sh | ||
| $ git push origin master | ||
| $ git push origin develop | ||
| Username for 'https://github.com': $user | ||
| Password for 'https://[email protected]': | ||
| Counting objects: 223, done. | ||
| Compressing objects: 100% (38/38), done. | ||
| Writing objects: 100% (69/69), 8.76 KiB | 0 bytes/s, done. | ||
| Total 69 (delta 53), reused 47 (delta 31) | ||
| To https://github.com/$user/velero-plugin.git | ||
| 8e107a9..5035fa1 master -> master | ||
| 8e107a9..5035fa1 develop -> develop | ||
| ``` | ||
|
|
||
| ### Contributing to a feature or bugfix | ||
|
|
||
| Always start with creating a new branch from master to work on a new feature or bugfix. Your branch name should have the format XX-descriptive where XX is the issue number you are working on followed by some descriptive text. For example: | ||
| Always start with creating a new branch from develop to work on a new feature or bugfix. Your branch name should have the format XX-descriptive where XX is the issue number you are working on followed by some descriptive text. For example: | ||
|
|
||
| ```sh | ||
| $ git checkout master | ||
| # Make sure the master is rebased with the latest changes as described in the previous step. | ||
| $ git checkout develop | ||
| # Make sure the develop is rebased with the latest changes as described in the previous step. | ||
| $ git checkout -b 1234-fix-developer-docs | ||
| Switched to a new branch '1234-fix-developer-docs' | ||
| ``` | ||
|
|
@@ -168,7 +168,7 @@ Happy Hacking! | |
| ```sh | ||
| # While on your myfeature branch (see above) | ||
| git fetch upstream | ||
| git rebase upstream/master | ||
| git rebase upstream/develop | ||
| ``` | ||
|
|
||
| While you rebase your changes, you must resolve any conflicts that might arise and build and test your changes using the above steps. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters