From 1c7754ab76a3fdf6b3d7081f10e64713eb90b209 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 18 Jul 2017 23:45:17 +0200 Subject: [PATCH] build: artifact scripts should push empty commits (#5835) --- scripts/deploy/publish-build-artifacts.sh | 4 +++- scripts/deploy/publish-docs-content.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/deploy/publish-build-artifacts.sh b/scripts/deploy/publish-build-artifacts.sh index 77dd50d2e5e..e689c991837 100755 --- a/scripts/deploy/publish-build-artifacts.sh +++ b/scripts/deploy/publish-build-artifacts.sh @@ -60,6 +60,8 @@ publishPackage() { cd ${repoDir} # Update the package.json version to include the current commit SHA. + # Normally this "sed" call would just replace the version placeholder, but the version in the + # package.json file is already replaced by the release task of the current package. sed -i "s/${buildVersion}/${buildVersion}-${commitSha}/g" package.json # For build artifacts the different Angular packages that refer to the 0.0.0-PLACEHOLDER should @@ -74,7 +76,7 @@ publishPackage() { echo "https://${MATERIAL2_BUILDS_TOKEN}:@github.com" > .git/credentials git add -A - git commit -m "${commitMessage}" + git commit --allow-empty -m "${commitMessage}" git tag "${buildVersion}-${commitSha}" git push origin master --tags diff --git a/scripts/deploy/publish-docs-content.sh b/scripts/deploy/publish-docs-content.sh index 26f3686651b..df470f4ae1f 100755 --- a/scripts/deploy/publish-docs-content.sh +++ b/scripts/deploy/publish-docs-content.sh @@ -90,6 +90,6 @@ git config credential.helper "store --file=.git/credentials" echo "https://${MATERIAL2_DOCS_CONTENT_TOKEN}:@github.com" > .git/credentials git add -A -git commit -m "$commitMessage" +git commit --allow-empty -m "$commitMessage" git tag "$commitSha" git push origin master --tags