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.

Sign up for GitHub

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

Jump to bottom

Makefile changes to allow easy builds with or without vendoring. Also fixes version bug for both cases. #1095

Merged
merged 11 commits into from Nov 29, 2019
Merged

Makefile changes to allow easy builds with or without vendoring. Also fixes version bug for both cases. #1095

merged 11 commits into from Nov 29, 2019

Commits on Nov 29, 2019

  1. Extracted -mod=vendor into a variable

    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    523b76b View commit details
    Browse the repository at this point in the history

  2. Use ?= to set variable only if not set yet. 

    This enables "MOD_VENDOR=  make all" use from command line
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    b6316ff View commit details
    Browse the repository at this point in the history

  3. Enable/disable vendoring with VENDOR=true or false. Enabled by default

    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    e1fea5c View commit details
    Browse the repository at this point in the history

  4. Make go generate use -mod=vendor depending on VENDOR flag

    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    4d036d5 View commit details
    Browse the repository at this point in the history

  5. Use GOMOD to specify module version to use. 

    GOMOD can be set to empty string, "vendor", "readonly" and in
Go 1.14 to "mod".  If not defined, defaults to "vendor".

Non empty values are passed to -mod parameter to Go tools, and
--modules-download-mode parameter for golangci-cli linting tool.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    6f4cb3a View commit details
    Browse the repository at this point in the history

  6. Fix versioning info when not using vendoring. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    d0a031d View commit details
    Browse the repository at this point in the history

  7. Updated build image to use Golintci-cli v1.21.0 and Go 1.13.4. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    29a39fe View commit details
    Browse the repository at this point in the history

  8. Updated build image to version 0.8.0. Changs: Golintci-cli v1.21.0, G… 

    …o 1.13.4.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    eb79166 View commit details
    Browse the repository at this point in the history

  9. Renamed MOD_VENDOR to MOD_FLAG to better describe its function. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    bdbb581 View commit details
    Browse the repository at this point in the history

  10. Fix version info in all command line tools. 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    c8127e1 View commit details
    Browse the repository at this point in the history

  11. Use loki-build-image:0.8.0 

    Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
    @pstibrany
    pstibrany committed Nov 29, 2019
    Copy the full SHA
    af36c0a View commit details
    Browse the repository at this point in the history