Merge pull request #3198 from dokku/cleanup-betafish-releases

Cleanup temporary changes during betafish releases
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2018-05-20 19:06:45 -04:00
commit ee8bdd4886
2 files changed
+5 -1

No files matched your search

+4
View File
@@ -346,6 +346,10 @@ main() {
fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package"
fn-repo-push-tags "$IS_RELEASE" fn-repo-push-tags "$IS_RELEASE"
if [[ "$IS_RELEASE" != "true" ]]; then
git reset -q HEAD plugins/*/plugin.toml
git checkout -- plugins/*/plugin.toml
fi
} }
main "$@" main "$@"
+1 -1
View File
@@ -55,7 +55,7 @@ fn-publish-package() {
declare desc="Publishes a package to packagecloud" declare desc="Publishes a package to packagecloud"
declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3" declare IS_RELEASE="$1" RELEASE_TYPE="$2" PACKAGE_NAME="$3"
local REPOSITORY=dokku/dokku-betafish DIST=ubuntu local REPOSITORY=dokku/dokku-betafish DIST=ubuntu
local OS_ID ex local OS_ID ex EXIT_CODE=0
[[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku [[ "$IS_RELEASE" == "true" ]] && REPOSITORY=dokku/dokku
[[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7 [[ "$RELEASE_TYPE" == "rpm" ]] && DIST=el/7