From 400999f6ad6353b2c0cb63f681e4cf527576c296 Mon Sep 17 00:00:00 2001 From: whitequark Date: Tue, 5 Jan 2016 16:06:05 +0000 Subject: [PATCH] Revert "conda: use BUILDNUMBER from environment." This reverts commit ff09a982c50df8d230c83b731c10bda55f2a645b. --- 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 be17db660..000674b69 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("BUILDNUMBER", 9999) }} + number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} 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 01e42d7bc..833c6c395 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("BUILDNUMBER", 9999) }} + number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} 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 bb76f3626..933569f11 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("BUILDNUMBER", 9999) }} + number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} 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 b06adbd50..d4f447496 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -7,7 +7,7 @@ source: build: noarch_python: true - number: {{ environ.get("BUILDNUMBER", 9999) }} + number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} entry_points: - artiq_client = artiq.frontend.artiq_client:main