diff --git a/.travis.yml b/.travis.yml index 331957d3..ed420a92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ env: - PACKAGE=icestorm - PACKAGE=iverilog - PACKAGE=nextpnr - - PACKAGE=verilator CONDA_BUILD_VERSION=2.1.17 + - PACKAGE=verilator - PACKAGE=vtr CONDA_CHANNELS=conda-forge - PACKAGE=yosys diff --git a/verilator/meta.yaml b/verilator/meta.yaml index a1f1f0fc..c2725a27 100644 --- a/verilator/meta.yaml +++ b/verilator/meta.yaml @@ -8,7 +8,14 @@ source: build: detect_binary_files_with_prefix: True - number: 1 + # y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH + # + # number: 10693001803050325 + # 1yyyy00zzzzzzzzzz + number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }} + # string: 0693.1803050325.g588ce0e3 + # yyyy.zzzzzzzzzz.gxxxxxxxx + string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }} script_env: - CI - TRAVIS