Skip to content

Commit

Permalink
Add the distribution artifact to the list of release files
Browse files Browse the repository at this point in the history
--
Change-Id: I09053cbd476e5f8bb5bdb9f272ad414d165f6d9f
Reviewed-on: https://bazel-review.googlesource.com/#/c/7131
MOS_MIGRATED_REVID=138855685
  • Loading branch information
aehlig committed Nov 11, 2016
1 parent d92b684 commit 279a061
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,6 @@ genrule(
outs = ["bazel-distfile.zip"],
cmd = "$(location :combine_distfiles.sh) $@ $(SRCS)",
tools = ["combine_distfiles.sh"],
# Public but bazel-only visibility.
visibility = ["//:__subpackages__"],
)
4 changes: 3 additions & 1 deletion scripts/ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ function bazel_build() {
fi
cp bazel-genfiles/site/jekyll-tree.tar $1/www.bazel.build.tar
cp bazel-genfiles/scripts/packages/README.md $1/README.md
cp bazel-genfiles/bazel-distfile.zip $1/bazel-${release_label}-dist.zip
fi
}

Expand Down Expand Up @@ -441,7 +442,8 @@ function bazel_release() {
for file in $folder/*; do
local filename=$(basename $file)
if [ "$filename" != README.md ]; then
if [ "$filename" == "bazel.dsc" ] || [ "$filename" == "bazel.tar.gz" ] ; then
if [ "$filename" == "bazel.dsc" ] || [ "$filename" == "bazel.tar.gz" ] \
|| [ "$filename" =~ "bazel-(.*)-dist.zip" ] ; then
local destfile=${tmpdir}/$filename
elif [[ "$file" =~ /([^/]*)(\.[^\./]+)$ ]]; then
local destfile=${tmpdir}/${BASH_REMATCH[1]}-${platform}${BASH_REMATCH[2]}
Expand Down
1 change: 1 addition & 0 deletions scripts/packages/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ filegroup(
":generate-package-info",
":bazel-debian",
":bazel-debian-src",
"//:bazel-distfile",
],
}),
)
Expand Down

0 comments on commit 279a061

Please sign in to comment.