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

v1.14: ci: fix do-audit don't report error (backport of #30728) #31009

Merged
merged 6 commits into from
May 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 31, 2023

This is an automatic backport of pull request #30728 done by Mergify.
Cherry-pick of f8abc8d has failed:

On branch mergify/bp/v1.14/pr-30728
Your branch is up to date with 'origin/v1.14'.

You are currently cherry-picking commit f8abc8df8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ci/docker-run.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ci/do-audit.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* ci: fix do-audit don't retport error

* Update ci/do-audit.sh

Co-authored-by: Trent Nelson <[email protected]>

* use the latest suggestion

* lint

* redirect stderr to stdout

* another solution

---------

Co-authored-by: Trent Nelson <[email protected]>
(cherry picked from commit f8abc8d)

# Conflicts:
#	ci/do-audit.sh
@mergify mergify bot added the conflicts label Mar 31, 2023
@mergify mergify bot assigned yihau Mar 31, 2023
@yihau yihau added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Mar 31, 2023
@yihau yihau requested a review from t-nelson March 31, 2023 18:53
@mergify
Copy link
Contributor Author

mergify bot commented Mar 31, 2023

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Mar 31, 2023
@t-nelson
Copy link
Contributor

we're gonna have to pick the fixes/ignores in behind it

@yihau yihau force-pushed the mergify/bp/v1.14/pr-30728 branch from 6170089 to 961ec28 Compare March 31, 2023 19:58
@yihau
Copy link
Member

yihau commented Mar 31, 2023

added 3 more commits to fix the audit issue

d4e0d15 => picked from #30886
c0887d3 => updated based on the concept which is from #30727
961ec28 => found an unexpected lock file so make storage-bigtable/build-proto become a root workspace member. (based on #29450 and #30273)

@codecov
Copy link

codecov bot commented Apr 1, 2023

Codecov Report

Merging #31009 (18f3699) into v1.14 (e297b2e) will increase coverage by 0.0%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            v1.14   #31009   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         664      664           
  Lines      185071   185071           
=======================================
+ Hits       152000   152057   +57     
+ Misses      33071    33014   -57     

@t-nelson
Copy link
Contributor

t-nelson commented Apr 1, 2023

thanks! follow along in #releng on discord RE updating vs. ignoring. openssl in particular has a quite the delta from where we are today

@github-actions github-actions bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Apr 17, 2023
@github-actions github-actions bot closed this Apr 24, 2023
@mergify mergify bot deleted the mergify/bp/v1.14/pr-30728 branch April 24, 2023 08:05
@t-nelson t-nelson restored the mergify/bp/v1.14/pr-30728 branch April 24, 2023 20:31
@t-nelson
Copy link
Contributor

not so fast robit

@t-nelson t-nelson reopened this Apr 24, 2023
@t-nelson t-nelson added do-not-close Add this tag to exempt an issue/PR from being closed by the stalebot and removed stale [bot only] Added to stale content; results in auto-close after a week. labels Apr 24, 2023
@t-nelson
Copy link
Contributor

@yihau can you pick the h2 audit fix in here and try to get ci green? i think we're comfortable with taking all of the audit backports

@yihau
Copy link
Member

yihau commented May 12, 2023

sure! will do it later!

@yihau yihau force-pushed the mergify/bp/v1.14/pr-30728 branch from 8e860fb to 18f3699 Compare May 12, 2023 16:32
Copy link
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

nice! ty

let's merge this one without squashing. let me know if branch protection is preventing that

@yihau
Copy link
Member

yihau commented May 13, 2023

yeah. I can only squash and merge. the protection works well
Screenshot 2023-05-13 at 11 43 52 AM

@joeaba joeaba merged commit d38effa into v1.14 May 15, 2023
@joeaba joeaba deleted the mergify/bp/v1.14/pr-30728 branch May 15, 2023 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-close Add this tag to exempt an issue/PR from being closed by the stalebot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants