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

Update loki-build-image to drone 1.4.0 #4462

Merged
merged 4 commits into from
Oct 14, 2021
Merged

Update loki-build-image to drone 1.4.0 #4462

merged 4 commits into from
Oct 14, 2021

Conversation

cstyan
Copy link
Contributor

@cstyan cstyan commented Oct 12, 2021

Noticed that something that should have been idempotent (running BUILD_IN_CONTAINER=false make drone) was resulting in changes to drone.yml when there were no changes to the jsonnet. The drone CLI version we're using is nearly 2y old and the change we need is in more recent releases.

It might also be a good idea to check for the same version that the image is using if the user uses BUILD_IN_CONTAINER=false make drone instead of just make drone, thoughts?

Signed-off-by: Callum Styan callumstyan@gmail.com

Signed-off-by: Callum Styan <callumstyan@gmail.com>
@cstyan cstyan requested a review from a team as a code owner October 12, 2021 23:06
@cyriltovena
Copy link
Contributor

Have you push the new image ?

Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@kavirajk kavirajk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Signed-off-by: Callum Styan <callumstyan@gmail.com>
Signed-off-by: Callum Styan <callumstyan@gmail.com>
@cyriltovena
Copy link
Contributor

I don't think drone will pick up the new build if you don;t make drone.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
@cstyan
Copy link
Contributor Author

cstyan commented Oct 14, 2021

I don't think drone will pick up the new build if you don;t make drone.

Yes good point. I wanted to save the drone.yml diff for another PR to make it easier to confirm whether any CI failures were related to the formatting changes from the new version of drone cli, but lets just get this all fixed in one go.

@cyriltovena cyriltovena merged commit 5f3e9a1 into grafana:main Oct 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants