Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use git hashes for packages versioning #60

Merged
merged 9 commits into from
Nov 22, 2019

Conversation

tgorochowik
Copy link
Member

@tgorochowik tgorochowik commented Nov 21, 2019

@tgorochowik tgorochowik force-pushed the packages-versioning branch 2 times, most recently from 66698f5 to e5ca3ea Compare November 21, 2019 11:15
@tgorochowik
Copy link
Member Author

Pushed a new version that concatenates the build date and the git hash to use it as the package version. This is more universal as the packages that don't use git tags failed with the previous approach and it is safer in terms of random tags that may appear in the repositories (see the original comment here).

I guess that if we want to add a more human readable version string to the package version we can do that individually for each package (but still make sure it is not the very first part of the version string so it gets sorted properly).

hzeller added a commit to hzeller/conda-packages that referenced this pull request Nov 21, 2019
(Bug SymbiFlow#59)

Signed-off-by: Henner Zeller <h.zeller@acm.org>
@mithro
Copy link
Member

mithro commented Nov 21, 2019

{% set version = '%s_%04i_%s'|format(GIT_DESCRIBE_TAG|replace('v', '') or '0.X', GIT_DESCRIBE_NUMBER|int, GIT_DESCRIBE_HASH or 'gUNKNOWN') %}

@mithro
Copy link
Member

mithro commented Nov 21, 2019

See the other meta.yml files for how version should be handled.

@mithro mithro force-pushed the packages-versioning branch 3 times, most recently from fa777cb to 28bf905 Compare November 22, 2019 05:03
tgorochowik and others added 4 commits November 21, 2019 21:07
This is a first step in an attempt to address SymbiFlow#59.

Signed-off-by: Tomasz Gorochowik <tgorochowik@antmicro.com>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Fixes a conflict between Python version uses for Yosys and Python
version used for boost.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Removes the `sigrok-cli_unreleased` tag from the repo.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
 * Add new USE_SYSTEM_GCC_VERSION environment variable.
 * Install the specified GCC version if environment variable exists.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
@mithro
Copy link
Member

mithro commented Nov 22, 2019

@tgorochowik - I've reworked you changes and gotten most of the upstream projects to add tags (tree-sitter/tree-sitter-verilog#38, MikePopoloski/slang#273, zachjs/sv2v#58). I've also gotten Icarus buffer overrun fixed (steveicarus/iverilog#287).

@mithro mithro merged commit 20eadc8 into SymbiFlow:master Nov 22, 2019
mithro pushed a commit to hzeller/conda-packages that referenced this pull request Nov 22, 2019
(Bug SymbiFlow#59)

Signed-off-by: Henner Zeller <h.zeller@acm.org>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
mithro pushed a commit to hzeller/conda-packages that referenced this pull request Nov 22, 2019
(Bug SymbiFlow#59)

Signed-off-by: Henner Zeller <h.zeller@acm.org>
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fixes the sudos in the slang package Invalid packages versioning Install conda-verify
2 participants