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

ci: fix do-audit don't report error #30728

Merged
merged 6 commits into from
Mar 16, 2023
Merged

Conversation

yihau
Copy link
Member

@yihau yihau commented Mar 15, 2023

Problem

Summary of Changes

Fixes #

@yihau yihau force-pushed the fix-audit-pipeline branch from 16a9807 to f5220a4 Compare March 15, 2023 16:01
@yihau yihau marked this pull request as ready for review March 15, 2023 16:01
@yihau
Copy link
Member Author

yihau commented Mar 15, 2023

will merge this one after #30727

@yihau yihau requested a review from t-nelson March 15, 2023 16:02
ci/do-audit.sh Outdated Show resolved Hide resolved
@yihau
Copy link
Member Author

yihau commented Mar 15, 2023

^^^ it failed at the expected place atm 👻

@yihau yihau force-pushed the fix-audit-pipeline branch from 1e68c25 to 9770f42 Compare March 15, 2023 17:12
@yihau
Copy link
Member Author

yihau commented Mar 15, 2023

I think it looks correct now after I redirect stderr to stdout 👻

Screenshot 2023-03-16 at 1 21 12 AM

@yihau yihau changed the title ci: fix do-audit don't retport error ci: fix do-audit don't report error Mar 15, 2023
@t-nelson
Copy link
Contributor

i guess we actually need to fix the audit now 😅

@yihau
Copy link
Member Author

yihau commented Mar 15, 2023

@t-nelson sure! The fixed PR is here https://www.github.com/solana-labs/solana/pull/30727 and I'm waiting for it green 🤞

@yihau
Copy link
Member Author

yihau commented Mar 15, 2023

btw, we can make docker output prints like a terminal if we want. 3b551a6

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.

:shipit:

@yihau
Copy link
Member Author

yihau commented Mar 16, 2023

🪖

@yihau yihau merged commit f8abc8d into solana-labs:master Mar 16, 2023
@yihau yihau deleted the fix-audit-pipeline branch March 16, 2023 03:58
@t-nelson t-nelson added the v1.14 label Mar 31, 2023
mergify bot pushed a commit that referenced this pull request Mar 31, 2023
* 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
joeaba added a commit that referenced this pull request May 15, 2023
This is an automatic backport of pull request #30728 done by
[Mergify](https://mergify.com).
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 f8abc8d.
  (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

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

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](https://dashboard.mergify.com/) you
can:

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

Finally, you can contact us on https://mergify.com
</details>
jumpsiegel pushed a commit to firedancer-io/solana that referenced this pull request May 30, 2023
* 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
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.

2 participants