diff --git a/build.yaml b/build.yaml index 3688dcb4342..13f9ff512b2 100644 --- a/build.yaml +++ b/build.yaml @@ -3278,7 +3278,7 @@ steps: clouds: - gcp - kind: runImage - name: deploy + name: release image: valueFrom: ci_utils_image.image script: | @@ -3310,22 +3310,22 @@ steps: time retry ./gradlew --version make wheel upload-artifacts DEPLOY_REMOTE=origin - bash scripts/deploy.sh $(cat /io/hail_pip_version) \ - $(cat /io/hail_version) \ - $(cat /io/git_version) \ - origin \ - /io/repo/hail/build/deploy/dist/hail-*-py3-none-any.whl \ - /io/github-oauth \ - docker://{{ hailgenetics_hail_image.image }} \ - docker://{{ hailgenetics_hailtop_image.image }} \ - docker://{{ hailgenetics_hail_image_python_3_10.image }} \ - docker://{{ hailgenetics_hail_image_python_3_11.image }} \ - docker://{{ hailgenetics_vep_grch37_85_image.image }} \ - docker://{{ hailgenetics_vep_grch38_95_image.image }} \ - /io/wheel-for-azure/hail-*-py3-none-any.whl \ - /io/www.tar.gz \ - {{ global.gcp_project }} \ - /io/repo/infra/gcp-broad/gcp-ar-cleanup-policy.txt + bash scripts/release.sh $(cat /io/hail_pip_version) \ + $(cat /io/hail_version) \ + $(cat /io/git_version) \ + origin \ + /io/repo/hail/build/deploy/dist/hail-*-py3-none-any.whl \ + /io/github-oauth \ + docker://{{ hailgenetics_hail_image.image }} \ + docker://{{ hailgenetics_hailtop_image.image }} \ + docker://{{ hailgenetics_hail_image_python_3_10.image }} \ + docker://{{ hailgenetics_hail_image_python_3_11.image }} \ + docker://{{ hailgenetics_vep_grch37_85_image.image }} \ + docker://{{ hailgenetics_vep_grch38_95_image.image }} \ + /io/wheel-for-azure/hail-*-py3-none-any.whl \ + /io/www.tar.gz \ + {{ global.gcp_project }} \ + /io/repo/infra/gcp-broad/gcp-ar-cleanup-policy.txt inputs: - from: /hail_version to: /io/hail_version diff --git a/hail/Makefile b/hail/Makefile index 2b797d53f3e..64fd0740468 100644 --- a/hail/Makefile +++ b/hail/Makefile @@ -413,9 +413,9 @@ test-dataproc-38: install-hailctl # # Create a hail docs www.tar.gz file (see build.yaml "make_docs" rule) and set WEBSITE_TAR to the path to www.tar.gz # -.PHONY: deploy -deploy: test-dataproc $(WHEEL) - bash scripts/deploy.sh $(HAIL_PIP_VERSION) $(HAIL_VERSION) $(REVISION) $(DEPLOY_REMOTE) $(WHEEL) $(GITHUB_OAUTH_HEADER_FILE) $(HAIL_GENETICS_HAIL_IMAGE) $(HAIL_GENETICS_HAIL_IMAGE_PY_3_10) $(HAIL_GENETICS_HAIL_IMAGE_PY_3_11) $(HAIL_GENETICS_HAILTOP_IMAGE) $(HAIL_GENETICS_VEP_GRCH37_85_IMAGE) $(HAIL_GENETICS_VEP_GRCH38_95_IMAGE) $(WHEEL_FOR_AZURE) $(WEBSITE_TAR) $(GCP_PROJECT) $(HAIL_HAIL_DIR)/../infra/gcp-broad/gcp-ar-cleanup-policy.txt +.PHONY: release +release: test-dataproc $(WHEEL) + bash scripts/release.sh $(HAIL_PIP_VERSION) $(HAIL_VERSION) $(REVISION) $(DEPLOY_REMOTE) $(WHEEL) $(GITHUB_OAUTH_HEADER_FILE) $(HAIL_GENETICS_HAIL_IMAGE) $(HAIL_GENETICS_HAIL_IMAGE_PY_3_10) $(HAIL_GENETICS_HAIL_IMAGE_PY_3_11) $(HAIL_GENETICS_HAILTOP_IMAGE) $(HAIL_GENETICS_VEP_GRCH37_85_IMAGE) $(HAIL_GENETICS_VEP_GRCH38_95_IMAGE) $(WHEEL_FOR_AZURE) $(WEBSITE_TAR) $(GCP_PROJECT) $(HAIL_HAIL_DIR)/../infra/gcp-broad/gcp-ar-cleanup-policy.txt python/hail/docs/change_log.rst: python/hail/docs/change_log.md sed -E "s/\(hail\#([0-9]+)\)/(\[#\1](https:\/\/github.com\/hail-is\/hail\/pull\/\1))/g" \ diff --git a/hail/scripts/deploy.sh b/hail/scripts/release.sh similarity index 94% rename from hail/scripts/deploy.sh rename to hail/scripts/release.sh index 2e3f490c0bb..cd5a625769f 100755 --- a/hail/scripts/deploy.sh +++ b/hail/scripts/release.sh @@ -10,7 +10,7 @@ retry() { (sleep 5 && "$@"); } -[[ $# -eq 16 ]] || (echo "./deploy.sh HAIL_PIP_VERSION HAIL_VERSION GIT_VERSION REMOTE WHEEL GITHUB_OAUTH_HEADER_FILE HAIL_GENETICS_HAIL_IMAGE HAIL_GENETICS_HAIL_IMAGE_PY_3_10 HAIL_GENETICS_HAIL_IMAGE_PY_3_11 HAIL_GENETICS_HAILTOP_IMAGE HAIL_GENETICS_VEP_GRCH37_85_IMAGE HAIL_GENETICS_VEP_GRCH38_95_IMAGE WHEEL_FOR_AZURE WEBSITE_TAR GCP_PROJECT GCP_AR_CLEANUP_POLICY" ; exit 1) +[[ $# -eq 16 ]] || (echo "./release.sh HAIL_PIP_VERSION HAIL_VERSION GIT_VERSION REMOTE WHEEL GITHUB_OAUTH_HEADER_FILE HAIL_GENETICS_HAIL_IMAGE HAIL_GENETICS_HAIL_IMAGE_PY_3_10 HAIL_GENETICS_HAIL_IMAGE_PY_3_11 HAIL_GENETICS_HAILTOP_IMAGE HAIL_GENETICS_VEP_GRCH37_85_IMAGE HAIL_GENETICS_VEP_GRCH38_95_IMAGE WHEEL_FOR_AZURE WEBSITE_TAR GCP_PROJECT GCP_AR_CLEANUP_POLICY" ; exit 1) HAIL_PIP_VERSION=$1 HAIL_VERSION=$2