Skip to content

Display diff if needed for verify-asdf-combine

Ash McKenzie requested to merge ashmckenzie/improve-verify-asdf-combine into main

What does this Merge Request do and why?

This small MR improves the output of make verify-asdf-combine to only show the diff if there is one.

Before

$ make verify-asdf-combine
Checking if .tool-versions is up-to-date:
/Users/ash/src/gitlab/gdks/gdk3/.tool-versions-gdk
--------------------------------------------------
ruby 2.7.5 3.0.2
nodejs 14.17.5
yarn 1.22.11
minio 2021-04-06T23-11-00Z
postgres 12.9 12.6
redis 6.0.16

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

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

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

https://gitlab.com/gitlab-org/gitlab-shell/-/raw/v13.22.1/.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.5

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

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.5
nodejs 14.17.5
yarn 1.22.11

Writing to /Users/ash/src/gitlab/gdks/gdk3/.tool-versions
================================================================================
golang 1.17.2 1.16.12 1.16.10
minio 2021-04-06T23-11-00Z
nodejs 14.17.5
postgres 12.9 12.6
redis 6.0.16
ruby 2.7.5 3.0.2 2.7.4
yarn 1.22.11
OK

After

$ make verify-asdf-combine
Checking if .tool-versions is up-to-date: OK

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.

Merge request reports