Merge pull request #9 from apilloud/release-2.12.0
Update wheels process to stage to gcs and pull version from branch
diff --git a/.travis.yml b/.travis.yml
index b4654f4..2338541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,9 @@
env:
global:
+ - VERSION=$(echo ${TRAVIS_BRANCH} | sed 's/release-//')
- PYTHON_ARTIFACTS_DIR=python
- STAGING=https://dist.apache.org/repos/dist/dev/beam/${VERSION}/${PYTHON_ARTIFACTS_DIR}
- - BEAM_SVN_DIR=https://dist.apache.org/repos/dist/dev/beam
- ZIP_FILE=apache-beam-${VERSION}.zip
- PLAT=x86_64
@@ -91,8 +91,13 @@
script:
- build_wheel apache-beam-${VERSION} $PLAT
-after_success:
- - ls -lh ${TRAVIS_BUILD_DIR}/wheelhouse/
-
- - source deploy_travis.sh
- - deploy
+deploy:
+ provider: gcs
+ access_key_id: ${ACCESS_KEY_ID}
+ secret_access_key: ${SECRET_ACCESS_KEY}
+ bucket: "beam-wheels-staging"
+ skip_cleanup: true
+ acl: public-read
+ local-dir: wheelhouse
+ on:
+ all_branches: true
diff --git a/README.md b/README.md
index 8a67945..9575c1b 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,10 @@
* In travis build console > More options > Settings > Environment Variables:
- * Add `VERSION` with 'Display value in build log' enabled (e.g.VERSION=2.6.0).
- * Add `APACHE_USERNAME` and `APACHE_SECRET` with 'Display value in build log' disabled(which encrypt your credential).
+ * Add `ACCESS_KEY_ID` and `SECRET_ACCESS_KEY` with 'Display value in build log' disabled.
+ These values can be obtained from the [GCP Storage Settings](https://console.cloud.google.com/storage/settings?project=apache-beam-testing)
+ under the interoperability tab.
- __NOTE__: If you have special characters in your credential, please escape them following the [guide](https://docs.travis-ci.com/user/encryption-keys/#note-on-escaping-certain-symbols) properly.
+* Create and push a new branch(e.g. release-2.6.0) into your fork beam-wheels repository, which will trigger the travis build of that version.
-* Create and push a new branch(e.g. release_2_6_0) into your folk beam-wheels repository, which will trigger the travis build.
-
-* Confirm that build successful and wheels get staged on dist.apache.org.
-
-* Delete your apache credential in travis environment.
+* Confirm that build successful and wheels get staged in beam-wheels-staging.
diff --git a/deploy_travis.sh b/deploy_travis.sh
deleted file mode 100644
index ffef872..0000000
--- a/deploy_travis.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# Define custom utilities for deploying on travis
-
-function deploy {
- cd ${TRAVIS_BUILD_DIR}/wheelhouse
- svn co ${BEAM_SVN_DIR}/${VERSION}
- for artifact in *.whl; do
- echo $artifact
- mv $artifact ${VERSION}/${PYTHON_ARTIFACTS_DIR}/$artifact
- svn add ${VERSION}/${PYTHON_ARTIFACTS_DIR}/$artifact
- cd ${VERSION}
- # Your apache credential is needed here in order to upload artifacts into dist.apache.org
- # Please add APACHE_USERNAME and APACHE_SECRET in travis build console > More options > Settings > Environment Variables with 'Display value in build log' disabled.
- # After build finishes, delete your environment variables.
- svn commit --non-interactive --no-auth-cache --username "$APACHE_USERNAME" --password "$APACHE_SECRET" -m "Upload python wheels"
- cd ..
- done
-}
