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

Fix CI by upgrading git in Grafana Dockerfile #10031

Merged
merged 1 commit into from Apr 20, 2020
Merged

Conversation

mrnugget
Copy link
Contributor

CI currently breaks because of:

#15 [builder 6/11] RUN apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 opens...
#15       digest: sha256:d6c31f8c1479b3ff92b7570f0d8298a792c6e3365e8a0c894dd16534b0fdc869
#15         name: "[builder 6/11] RUN apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 openssh=8.1_p1-r0 build-base=0.5-r1"
#15      started: 2020-04-20 10:19:02.164456511 +0000 UTC
#15 0.659 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/APKINDEX.tar.gz
#15 0.776 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/community/x86_64/APKINDEX.tar.gz
#15 0.886 ERROR: unsatisfiable constraints:
#15    completed: 2020-04-20 10:19:03.136479497 +0000 UTC
#15     duration: 972.022986ms
#15        error: "executor failed running [/bin/sh -c apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 openssh=8.1_p1-r0 build-base=0.5-r1]: exit code: 1"
#15 0.901   git-2.24.2-r1:
#15 0.901     breaks: world[git=2.24.2-r0]

And in the Alpine packages git has been upgraded from 2.24.2-r0 to
2.24.2-r1: https://pkgs.alpinelinux.org/packages?name=git&branch=v3.11

CI currently breaks because of:

    #15 [builder 6/11] RUN apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 opens...
    #15       digest: sha256:d6c31f8c1479b3ff92b7570f0d8298a792c6e3365e8a0c894dd16534b0fdc869
    #15         name: "[builder 6/11] RUN apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 openssh=8.1_p1-r0 build-base=0.5-r1"
    #15      started: 2020-04-20 10:19:02.164456511 +0000 UTC
    #15 0.659 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/main/x86_64/APKINDEX.tar.gz
    #15 0.776 fetch http://dl-cdn.alpinelinux.org/alpine/v3.11/community/x86_64/APKINDEX.tar.gz
    #15 0.886 ERROR: unsatisfiable constraints:
    #15    completed: 2020-04-20 10:19:03.136479497 +0000 UTC
    #15     duration: 972.022986ms
    #15        error: "executor failed running [/bin/sh -c apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 openssh=8.1_p1-r0 build-base=0.5-r1]: exit code: 1"
    #15 0.901   git-2.24.2-r1:
    #15 0.901     breaks: world[git=2.24.2-r0]

And in the Alpine packages git has been upgraded from 2.24.2-r0 to
2.24.2-r1: https://pkgs.alpinelinux.org/packages?name=git&branch=v3.11
@mrnugget mrnugget requested review from a team April 20, 2020 11:48
@felixfbecker
Copy link
Contributor

Really need Renovate to do those automatically

@codecov
Copy link

codecov bot commented Apr 20, 2020

Codecov Report

Merging #10031 into master will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master   #10031      +/-   ##
==========================================
- Coverage   42.77%   42.77%   -0.01%     
==========================================
  Files        1348     1348              
  Lines       74019    74019              
  Branches     6649     6648       -1     
==========================================
- Hits        31662    31660       -2     
- Misses      39495    39498       +3     
+ Partials     2862     2861       -1     
Flag Coverage Δ
#unit 42.77% <0.00%> (-0.01%) ⬇️
Impacted Files Coverage Δ
cmd/frontend/graphqlbackend/codeintel.go 0.00% <ø> (ø)
cmd/frontend/graphqlbackend/git_tree_entry.go 25.39% <0.00%> (ø)
cmd/symbols/internal/symbols/search.go 70.20% <ø> (+0.74%) ⬆️
...nterprise/internal/codeintel/resolvers/location.go 0.00% <ø> (ø)
enterprise/internal/codeintel/resolvers/query.go 0.00% <0.00%> (ø)
...nterprise/internal/codeintel/resolvers/resolver.go 0.00% <0.00%> (ø)
enterprise/internal/codeintel/resolvers/upload.go 0.00% <ø> (ø)
web/src/search/input/MonacoQueryInput.tsx 0.00% <0.00%> (ø)

@mrnugget mrnugget merged commit f623f7a into master Apr 20, 2020
@mrnugget mrnugget deleted the fix-ci/git-grafana branch April 20, 2020 11:52
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.

None yet

2 participants