Skip to content

build: artifact scripts should push empty commits #5835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 18, 2017
Merged

build: artifact scripts should push empty commits #5835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion scripts/deploy/publish-build-artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy/publish-docs-content.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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