Fix bintray release structure (#531)
Same file name is not allowed across packages in one version.
diff --git a/.bintray.json b/.bintray.json
index 98fa88d..592f8cc 100644
--- a/.bintray.json
+++ b/.bintray.json
@@ -1,31 +1,21 @@
{
"package": {
- "name": "${TRAVIS_OS_NAME}-bin",
+ "name": "snapshots",
"repo": "brotli",
"subject": "eustas"
},
"version": {
- "name": "${RELEASE_VERSION}",
- "desc": "Binary Artifacts (Snapshot)",
+ "name": "${TRAVIS_OS_NAME}-${RELEASE_DATE}",
+ "desc": "Binary Artifacts (Dev)",
"released": "${RELEASE_DATE}",
"gpgSign": false
},
"files": [
{
- "includePattern": "bazel-bin/(libbrotli.*\\.a)",
- "uploadPattern": "$1",
- "matrix_params": {"override": 1}
- },
- {
- "includePattern": "bazel-bin/(libbrotli.*\\.so)",
- "uploadPattern": "$1",
- "matrix_params": {"override": 1}
- },
- {
- "includePattern": "bazel-bin/bro",
- "uploadPattern": "bro",
+ "includePattern": "brotli.zip",
+ "uploadPattern": "brotli.zip",
"matrix_params": {"override": 1}
}
],
diff --git a/.travis.sh b/.travis.sh
index 7e3ad9c..d84d105 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -91,8 +91,8 @@
case "${BUILD_SYSTEM}" in
"bazel")
export RELEASE_DATE=`date +%Y-%m-%d`
- export RELEASE_VERSION=`date +snapshot.%Y.%m.%d`
perl -p -i -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' .bintray.json
+ zip -j9 brotli.zip bazel-bin/libbrotli*.a bazel-bin/libbrotli*.so bazel-bin/bro
;;
esac
;;