Skip to content

Commit

Permalink
Merge branch 'haipIsLocked' into 'master'
Browse files Browse the repository at this point in the history
Added isLocked property to HA-IP

See merge request transip/restapi-cli-client!121
  • Loading branch information
dionbosschieter committed Jan 18, 2021
2 parents f8ecb34 + e223f8d commit afc6847
Show file tree
Hide file tree
Showing 4 changed files with 721 additions and 266 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
CHANGELOG
=========

6.5.0
-----
* Added isLocked property to HA-IP

6.4.0
-----
* Added UUID property to VPS
Expand Down
12 changes: 10 additions & 2 deletions ci/sync_to_github.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,16 @@ if [ -z "$GITHUB_CREDENTIALS" ] ; then
exit 1;
fi

# Remove the default origin/HEAD -> origin/master ref
# as github shows this as new branch
if [ -z "$CI_REPOSITORY_URL" ] ; then
echo "we need a repository url to proceed";
exit 1;
fi

# force a full clone, instead of expecting a non shallow repository
git clone $CI_REPOSITORY_URL /tmp/repository
cd /tmp/repository

# Remove the default origin/HEAD -> origin/master ref as github shows this as new branch
git remote set-head origin -d

git push --prune https://${GITHUB_CREDENTIALS}@github.com/transip/tipctl.git +refs/remotes/origin/*:refs/heads/* +refs/tags/*:refs/tags/*
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"symfony/console": "^4.3",
"symfony/finder": "^4.3",
"symfony/filesystem": "^4.3",
"transip/transip-api-php": "6.4.*",
"transip/transip-api-php": "^6.5",
"symfony/yaml": "^4.3",
"webmozart/path-util": "^2.3"
},
Expand Down
Loading

0 comments on commit afc6847

Please sign in to comment.