diff --git a/.travis.yml b/.travis.yml index f51eb21..5930ac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,3 @@ script: branches: only: - master - - develop diff --git a/README.md b/README.md index b7d8dbf..36f76c5 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Currently, Deer supports these languages :earth_americas:. If you would like to :poland: | Polski | :brazil: | Português do Brasil | :czech_republic: | Česky | + :de: | German | ### Download @@ -57,7 +58,7 @@ macOS | Windows | Linux [More information about this release](https://github.com/abahmed/Deer/releases/latest) ### Nightly builds -Nightly builds :airplane: are produced **automatically** for development branch (**develop**), so that people can help us testing features that have just been added +Nightly builds :airplane: are produced **automatically** for latest changes, so that people can help us testing features that have just been added macOS | Windows | Linux -----------------| ---| ---| diff --git a/deploy.js b/deploy.js index 7bd7366..71035cd 100644 --- a/deploy.js +++ b/deploy.js @@ -2,7 +2,6 @@ const Octokit = require('@octokit/rest') const fs = require('fs') const mime = require('mime') const path = require('path') -const appInfo = require('./package.json') const glob = require('glob-fs')({ gitignore: false }) var NightlyDeploy = { @@ -57,11 +56,11 @@ var NightlyDeploy = { this.getAssets(this.release.id) }).catch(e => { console.log('Unable to get release info...') - if (e.code === 404) { + if (e.status === 404) { // Create the release as it does not exist. this.createRelease('nightly builds', - 'This release is produced automatically for development branch' + - '(develop), so that people can help us testing the features that ' + + 'This release is produced automatically for latest changes, ' + + 'so that people can help us testing the features that ' + 'have just been added') } else { throw new Error('Unhandled response for getReleaseByTag: ' + e) @@ -242,7 +241,7 @@ if (isPullRequest) { } const branch = process.env.TRAVIS_BRANCH -if (branch === 'develop') { +if (branch === 'master') { NightlyDeploy.init({ owner: 'abahmed', repo: 'Deer', @@ -252,16 +251,6 @@ if (branch === 'develop') { dir: './dist', token: process.env.GH_TOKEN }) -} else if (branch === 'master') { - NightlyDeploy.init({ - owner: 'abahmed', - repo: 'Deer', - branch: branch, - tag: appInfo.version, - assets: getAssetNames(assets), - dir: './dist', - token: process.env.GH_TOKEN - }) } else { console.log('No deployments for ' + branch) process.exit() diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 763e71e..6b24074 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -8,7 +8,7 @@ Before making changes, please first discuss the change you want to make through + [Suggest new features to be implemented](https://github.com/abahmed/Deer/issues) + [Report issues](https://github.com/abahmed/Deer/issues) -+ [Improve Documentation](https://github.com/abahmed/Deer/blob/develop/docs/README.md) ++ [Improve Documentation](https://github.com/abahmed/Deer/blob/master/docs/README.md) + [Fixing issues](https://github.com/abahmed/Deer/issues) @@ -17,7 +17,7 @@ Before making changes, please first discuss the change you want to make through If you wish to work on an issue, please comment on the issue that you want to work on it. This is to prevent duplicated efforts on the same issue. -Contributions to Deer should be made in the form of pull requests to the **develop** branch. Each pull request will be reviewed by someone with permission to land patches. After reviewing the patch, it could be landed in the develop branch or given feedback for changes. (Seems not clear to you! Don't worry, we have added tutorials for [Github Workflow](./GitHub-workflow.md) +Contributions to Deer should be made in the form of pull requests to the **master** branch. Each pull request will be reviewed by someone with permission to land patches. After reviewing the patch, it could be landed in the master branch or given feedback for changes. (Seems not clear to you! Don't worry, we have added tutorials for [Github Workflow](./GitHub-workflow.md) ### JavaScript Style guide diff --git a/docs/GitHub-workflow.md b/docs/GitHub-workflow.md index d841aa7..c35e87f 100644 --- a/docs/GitHub-workflow.md +++ b/docs/GitHub-workflow.md @@ -6,7 +6,7 @@ Firstly, You need to [Fork](https://help.github.com/articles/fork-a-repo/) Deer `git clone https://github.com/YOUR-USER_NAME/Deer` -According to GitHub naming we will call : +According to GitHub naming we will call : + The repository you have forked **origin** and its link is `https://github.com/YOUR-USER_NAME/Deer` + This repository **upstream** and its link is `https://github.com/abahmed/Deer` @@ -17,7 +17,7 @@ The previous steps are done once, then these steps that you should follow every ``` git fetch upstream - git checkout -b LOCAL_BRANCH_NAME upstream/develop + git checkout -b LOCAL_BRANCH_NAME upstream/master ``` 2. Do your code changes then commit @@ -32,10 +32,10 @@ The previous steps are done once, then these steps that you should follow every git push -u origin "LOCAL_BRANCH_NAME" ``` -4. Create a [Pull Request(PR)](https://help.github.com/articles/using-pull-requests/) to the branch **develop**. To notify the reviewer that will review this PR, you can write r? @USER_NAME +4. Create a [Pull Request(PR)](https://help.github.com/articles/using-pull-requests/) to the branch **master**. To notify the reviewer that will review this PR, you can write r? @USER_NAME + +5. After getting reviewers' feedback - if something needs to be changed, added, removed or fixed and these changes are minor (means you didn't get **r+**, just fix it in a new commit on the same branch -5. After getting reviewers' feedback - if something needs to be changed, added, removed or fixed and these changes are minor (means you didn't get **r+**, just fix it in a new commit on the same branch - ``` git commit --fixup SHA1_OF_THE_PREVIOUS_COMMIT (You can get it using **git log**) ``` @@ -46,5 +46,5 @@ The previous steps are done once, then these steps that you should follow every ``` git fetch upstream - git rebase upstream/develop + git rebase upstream/master ```