diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-12-06 07:04:19 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-12-06 07:04:19 +0000 |
| commit | b8ec86052d0147d812e206f6eb62badb32ea4537 (patch) | |
| tree | 0b0522fd80bc34db0ca3145ed472a5c61a41b3ad | |
| parent | 0cc2da1a8c326e009dd4a9b98e1d4db0f8c4cd1c (diff) | |
| download | navit-b8ec86052d0147d812e206f6eb62badb32ea4537.tar.gz | |
Update:i18n:Use rebase instead of a PR for translations updatesR7118
| -rw-r--r-- | ci/merge_i18n_update.sh | 4 | ||||
| -rw-r--r-- | ci/submit_i18n_pr.sh | 16 | ||||
| -rw-r--r-- | circle.yml | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/ci/merge_i18n_update.sh b/ci/merge_i18n_update.sh new file mode 100644 index 000000000..2d62cf0ad --- /dev/null +++ b/ci/merge_i18n_update.sh @@ -0,0 +1,4 @@ +git rebase master +git checkout master +git merge --squash ${CIRCLE_BRANCH} +git commit diff --git a/ci/submit_i18n_pr.sh b/ci/submit_i18n_pr.sh deleted file mode 100644 index 7ae5ae9cb..000000000 --- a/ci/submit_i18n_pr.sh +++ /dev/null @@ -1,16 +0,0 @@ -wget https://github.com/github/hub/releases/download/v2.2.1/hub-linux-amd64-2.2.1.tar.gz -tar xvfz hub-linux-amd64-2.2.1.tar.gz -sudo mv hub-linux-amd64-2.2.1/hub /usr/local/bin/ -sudo chmod +x /usr/local/bin/hub - - -cat > ~/.config/hub << EOF -github.com: -- user: ${HUB_USER} - oauth_token: ${HUB_TOKEN} - protocol: https -EOF - -message=`git log -1 --pretty=%B` - -echo "Automatic translation import" | hub pull-request -b trunk -m "$message" -F - diff --git a/circle.yml b/circle.yml index 04470f87e..d00c9f624 100644 --- a/circle.yml +++ b/circle.yml @@ -57,7 +57,7 @@ deployment: branch: /i18n.*/ owner: navit-gps commands: - - bash ci/submit_i18n_pr.sh + - bash ci/merge_i18n_update.sh notify: webhooks: - url: http://62.210.125.30:8000/ |