From ff09a982c50df8d230c83b731c10bda55f2a645b Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 5 Jan 2016 15:46:42 +0000 Subject: [PATCH] conda: use BUILDNUMBER from environment. --- conda/artiq-kc705-nist_qc1/meta.yaml | 2 +- conda/artiq-kc705-nist_qc2/meta.yaml | 2 +- conda/artiq-pipistrello-nist_qc1/meta.yaml | 2 +- conda/artiq/meta.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conda/artiq-kc705-nist_qc1/meta.yaml b/conda/artiq-kc705-nist_qc1/meta.yaml index 000674b69..be17db660 100644 --- a/conda/artiq-kc705-nist_qc1/meta.yaml +++ b/conda/artiq-kc705-nist_qc1/meta.yaml @@ -7,7 +7,7 @@ source: build: noarch_python: true - number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + number: {{ environ.get("BUILDNUMBER", 9999) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} requirements: diff --git a/conda/artiq-kc705-nist_qc2/meta.yaml b/conda/artiq-kc705-nist_qc2/meta.yaml index 833c6c395..01e42d7bc 100644 --- a/conda/artiq-kc705-nist_qc2/meta.yaml +++ b/conda/artiq-kc705-nist_qc2/meta.yaml @@ -7,7 +7,7 @@ source: build: noarch_python: true - number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + number: {{ environ.get("BUILDNUMBER", 9999) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} requirements: diff --git a/conda/artiq-pipistrello-nist_qc1/meta.yaml b/conda/artiq-pipistrello-nist_qc1/meta.yaml index 933569f11..bb76f3626 100644 --- a/conda/artiq-pipistrello-nist_qc1/meta.yaml +++ b/conda/artiq-pipistrello-nist_qc1/meta.yaml @@ -7,7 +7,7 @@ source: build: noarch_python: true - number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + number: {{ environ.get("BUILDNUMBER", 9999) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} requirements: diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index d4f447496..b06adbd50 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -7,7 +7,7 @@ source: build: noarch_python: true - number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} + number: {{ environ.get("BUILDNUMBER", 9999) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} entry_points: - artiq_client = artiq.frontend.artiq_client:main