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

chore: bump erda-infra version for gohook #6248

Merged
merged 1 commit into from
Jan 19, 2024

Conversation

sfwn
Copy link
Member

@sfwn sfwn commented Jan 18, 2024

What this PR does / why we need it:

bump erda-infra version for gohook

Which issue(s) this PR fixes:

ChangeLog

Language Changelog
🇺🇸 English bump erda-infra version for gohook
🇨🇳 中文 升级 erda-infra 版本以适应 gohook

Copy link

codecov bot commented Jan 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (e5a8333) 22.67% compared to head (e535bf1) 22.66%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6248      +/-   ##
==========================================
- Coverage   22.67%   22.66%   -0.01%     
==========================================
  Files        1833     1833              
  Lines      196311   196311              
==========================================
- Hits        44514    44502      -12     
- Misses     146684   146694      +10     
- Partials     5113     5115       +2     

see 7 files with indirect coverage changes

@sfwn sfwn merged commit b839597 into erda-project:master Jan 19, 2024
20 checks passed
@sfwn
Copy link
Member Author

sfwn commented Feb 4, 2024

/cherry-pick release/2.4-beta.5

@erda-bot
Copy link
Member

erda-bot commented Feb 4, 2024

Automated cherry pick failed, please resolve the confilcts and create PR manually.
Details:

Auto-merging go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
diff --cc go.sum
index 2fdf65cdf,e2d0e187d..000000000
--- a/go.sum
+++ b/go.sum
@@@ -563,10 -561,8 +563,15 @@@ github.com/envoyproxy/protoc-gen-valida
  github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
  github.com/erda-project/elastic v0.0.1-ex h1:5ajfxQ5S5YjpzFqY9LzL9hiKWCn6q/JDT4n8sNv7+pU=
  github.com/erda-project/elastic v0.0.1-ex/go.mod h1:iAVsas6fcmt9pxtge1+dErMhecv+RLSXlD4rnZRJVW0=
++<<<<<<< HEAD
 +github.com/erda-project/erda-infra v1.0.9-0.20231213094429-67b1657b3593 h1:foLm8eCYTpjz2yDccu3+oz8fXv536wXn0TR/xhqWmCo=
 +github.com/erda-project/erda-infra v1.0.9-0.20231213094429-67b1657b3593/go.mod h1:TS2BPw1crvFCMRqIi3gxZSaJvWw/XIjYmISiPJljFPU=
 +github.com/erda-project/erda-infra v1.0.10-0.20240112020002-e4c6c25a3fcf h1:s15eIENYaTZW6ome6IxfQCSMPsIJPRz7x0SLnSjsV+w=
 +github.com/erda-project/erda-infra v1.0.10-0.20240112020002-e4c6c25a3fcf/go.mod h1:TS2BPw1crvFCMRqIi3gxZSaJvWw/XIjYmISiPJljFPU=
++=======
+ github.com/erda-project/erda-infra v1.0.10-0.20240118060147-12597556bdbe h1:tHTV5bMp7hBG9CZOhHQ5YG8rdusYNmWY18aPbbrabQw=
+ github.com/erda-project/erda-infra v1.0.10-0.20240118060147-12597556bdbe/go.mod h1:TS2BPw1crvFCMRqIi3gxZSaJvWw/XIjYmISiPJljFPU=
++>>>>>>> b8395976a (bump erda-infra version for gohook (#6248))
  github.com/erda-project/erda-infra/tools v0.0.0-20231213094429-67b1657b3593 h1:yqny9kVbick5hUsDQJU4yp9rpZBteNf2FKkUxce/2GU=
  github.com/erda-project/erda-infra/tools v0.0.0-20231213094429-67b1657b3593/go.mod h1:F+j8QqEq1dFwrKMK1Ab2+b21ZVTfmMwl16az1+EMmVM=
  github.com/erda-project/erda-oap-thirdparty-protocol v0.0.0-20210907135609-15886a136d5b h1:GWf2ChasZFerFwQoTokIvjJLWH57ligTSLD2hUb7UWk=

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants