Skip to content

Include more .tool-versions in parsing

Ash McKenzie requested to merge 1356-include-gitlab-shell-s-tool-versions-file-as-part-of-support-asdf-combine into main

What does this Merge Request do and why?

This MR updates support/asdf-combine to consider more .tool-versions files and refs when determining the ultimate .tool-versions:

$ support/asdf-combine

/Users/ash/src/gitlab/gitlab-development-kit/.tool-versions-gdk
---------------------------------------------------------------
ruby 2.7.4 3.0.2
nodejs 14.17.5
yarn 1.22.11
minio 2021-04-06T23-11-00Z
postgres 12.9 12.6 11.9
redis 6.0.16 6.0.15

https://gitlab.com/gitlab-org/gitlab/-/raw/master/.tool-versions
----------------------------------------------------------------
nodejs 14.17.5
ruby 2.7.4
yarn 1.22.11

https://gitlab.com/gitlab-org/gitlab/-/raw/master/workhorse/.tool-versions
--------------------------------------------------------------------------
golang 1.16.9

https://gitlab.com/gitlab-org/gitlab-shell/-/raw/main/.tool-versions
--------------------------------------------------------------------
ruby 2.7.4
golang 1.16.10

https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v13.22.0/.tool-versions
------------------------------------------------------------------------
ruby 2.7.4
golang 1.16.10

https://gitlab.com/gitlab-org/gitlab-pages/-/raw/master/.tool-versions
----------------------------------------------------------------------
golang 1.16.10

https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v1.48.0/.tool-versions
-----------------------------------------------------------------------
golang 1.16.10

https://gitlab.com/gitlab-org/gitaly/-/raw/master/.tool-versions
----------------------------------------------------------------
golang 1.17.2 1.16.10
ruby 2.7.4

https://gitlab.com/gitlab-org/gitaly/-/raw/8f04e23b9f004d70635aaeecd30d837a584572f8/.tool-versions
--------------------------------------------------------------------------------------------------
golang 1.17.2 1.16.9
ruby 2.7.4

https://gitlab.com/gitlab-org/gitlab-ui/-/raw/main/.tool-versions
-----------------------------------------------------------------
nodejs 14.17.5
yarn 1.22.11

https://gitlab.com/gitlab-org/gitlab-docs/-/raw/main/.tool-versions
-------------------------------------------------------------------
ruby 2.7.4
nodejs 14.17.5
yarn 1.22.11

Writing to /Users/ash/src/gitlab/gitlab-development-kit/.tool-versions
================================================================================
golang 1.17.2 1.16.10 1.16.9
minio 2021-04-06T23-11-00Z
nodejs 14.17.5
postgres 12.9 12.6 11.9
redis 6.0.16 6.0.15
ruby 2.7.4 3.0.2
yarn 1.22.11

Merge Request checklist

  • This change is backward compatible. If not, please include steps to communicate to our users.
  • Tests added for new functionality. If not, please raise Issue to follow-up.
  • Documentation added/updated, if needed.
  • gdk doctor test added, if needed.
  • Add the ~highlight label if this MR should be included in the CHANGELOG.md.

Closes #1356 (closed)

Edited by Ash McKenzie

Merge request reports