srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

conda: limit git hashes in build numbers to 8 chars exactly. 

Before this commit, a nasty edge case was possible where repositories
on different builders have had different sets of objects fetched
into them, and so git-describe selected different lengths for
abbreviating hashes.

See also https://github.com/conda/conda-build/issues/1940.
This commit is contained in:
whitequark 2017-04-20 16:40:10 +00:00 committed by Sebastien Bourdeauducq
parent 1572d852aa
commit 419042b5d3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conda/artiq-dev/meta.yaml
View File

@ -8,7 +8,7 @@ source:
build: build:
noarch_python: true noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:9] }}
requirements: requirements:
run: run:

2
conda/artiq-kc705-nist_clock/meta.yaml
View File

@ -8,7 +8,7 @@ source:
build: build:
noarch_python: true noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:9] }}
requirements: requirements:
build: build:

2
conda/artiq-kc705-nist_qc2/meta.yaml
View File

@ -8,7 +8,7 @@ source:
build: build:
noarch_python: true noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:9] }}
requirements: requirements:
build: build:

2
conda/artiq-pipistrello-nist_qc1/meta.yaml
View File

@ -8,7 +8,7 @@ source:
build: build:
noarch_python: true noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:9] }}
requirements: requirements:
build: build:

2
conda/artiq/meta.yaml
View File

@ -8,7 +8,7 @@ source:
build: build:
noarch_python: true noarch_python: true
number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }} number: {{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}
string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:] }} string: py_{{ environ.get("GIT_DESCRIBE_NUMBER", 0) }}+git{{ environ.get("GIT_DESCRIBE_HASH", "")[1:9] }}
requirements: requirements:
build: build: