ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-12 07:52:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #572 via VersionBot

Browse Source 
automation: Use ssh instead of https to PR to meta-resin
This commit is contained in:
resin-io-versionbot[bot] 2018-03-15 17:51:59 +00:00 committed by GitHub
commit ad35375994
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## v7.1.15 - 2018-03-15
* Automation: Use ssh instead of https to PR to meta-resin #572 [Pablo Carranza Velez]
## v7.1.14 - 2018-03-15 ## v7.1.14 - 2018-03-15
* Avoid trying to clean up the supervisor image if it has several tags (even though it would never succeed) #589 [Pablo Carranza Velez] * Avoid trying to clean up the supervisor image if it has several tags (even though it would never succeed) #589 [Pablo Carranza Velez]

13
automation/pr-to-meta-resin.sh
View File

@ -6,8 +6,9 @@
# #
# If $PR_1X is "true", an additional PR for 1.X will be created. # If $PR_1X is "true", an additional PR for 1.X will be created.
# #
# Requires $GITHUB_USER and $GITHUB_PASSWORD to push and create the pull-request. # Requires ssh keys set up to push and create the pull-request.
# Requires $TAG to be set to the supervisor version to use. # Requires $TAG to be set to the supervisor version to use.
# Requires hub to be installed (see https://github.com/github/hub)
# #
set -e set -e
@ -18,13 +19,7 @@ if [ -z "$TAG" ]; then
exit 1 exit 1
fi fi
if [[ -z "$GITHUB_PASSWORD" || -z "$GITHUB_USER" ]]; then REPO_URL="git@github.com:resin-os/meta-resin.git"
echo "GITHUB_USER and GITHUB_PASSWORD are required"
exit 1
fi
REPO_URL=https://github.com/resin-os/meta-resin.git
REPO_URL_WITH_CREDENTIALS=https://${GITHUB_USER}:${GITHUB_PASSWORD}@github.com/resin-os/meta-resin.git
USER=${USER:-$(whoami)} USER=${USER:-$(whoami)}
function prepareBranches() { function prepareBranches() {
@ -52,7 +47,7 @@ Changelog-Entry: Update supervisor to ${TAG}
Change-Type: patch Change-Type: patch
" "
git push $REPO_URL_WITH_CREDENTIALS $HEAD git push origin $HEAD
hub pull-request -b ${BASE} -m "${BASE}: Update supervisor to ${TAG} hub pull-request -b ${BASE} -m "${BASE}: Update supervisor to ${TAG}

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.", "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "7.1.14", "version": "7.1.15",
"license": "Apache-2.0", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",