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

Upgrade dependencies, then ignore some more duplicates #3716

Merged
merged 8 commits into from
Mar 3, 2022

Conversation

teor2345
Copy link
Contributor

@teor2345 teor2345 commented Mar 3, 2022

Motivation

This is a suggested fix for some duplicate dependencies in:

Extra Changes

  • ignore duplicate darling dependencies, we'll fix them when we upgrade abscissa or arti
  • change a color-eyre ignore to a tracing-subscriber ignore

gustavovalverde and others added 8 commits March 2, 2022 14:15
* add(tests): full sync test

* fix(test): add build

* fix(deploy): escape double dashes '--' correctly

* fix(test): remove unexpected --no-capture arg

error: Found argument '--nocapture' which wasn't expected, or isn't valid in this context

* refactor(docker): use default executable as entrypoint

* refactor(startup): add a custom entrypoint

* fix(test): add missing TEST_FULL_SYNC variable

* test(timeout): use the biggest machine

* fix

* fix(deploy): use latest successful image

* typo

* refactor(docker): generate config file at startup

* revert(build): changes were made to docker

* fix(docker): send variables correctly to the entrypoint

* test different conf file approach

* fix(env): add RUN_TEST env variable

* ref: use previous approach

* fix(color): use environment variable

* fix(resources): use our normal machine size

* fix(ci): double CPU and RAM for full sync test

* fix(test): check for zebrad test output in the correct order

The mempool is only activated once, so we must check for that log first.
After mempool activation, the stop regex is logged at least once.
(It might be logged before as well, but we can't rely on that.)

When checking that the mempool didn't activate,
wait for the `zebrad` command to exit,
then check the entire log.

* fix(ci): run full sync test with full compiler optimisations

* fix(tests): reintroduce tests and run full sync on approval

* fix(tests): reduce the changelog

Co-authored-by: teor <teor@riseup.net>
* ci(test): re-run tests when snapshot data changes

* fix(ci): rebuild state when disk format changes

* fix(ci): rebuild rust docs when code or dependencies change

* doc(ci): explain why we run jobs when files change

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>
If we assign two teams, GitHub assigns two reviewers.
@teor2345 teor2345 added A-dependencies Area: Dependency file updates A-devops Area: Pipelines, CI/CD and Dockerfiles P-Medium ⚡ labels Mar 3, 2022
@teor2345 teor2345 requested a review from a team as a code owner March 3, 2022 00:45
@teor2345 teor2345 self-assigned this Mar 3, 2022
@teor2345 teor2345 requested review from a team as code owners March 3, 2022 00:45
@teor2345 teor2345 requested review from conradoplg, upbqdn and oxarbitrage and removed request for a team March 3, 2022 00:45
@teor2345 teor2345 mentioned this pull request Mar 3, 2022
@teor2345 teor2345 changed the base branch from main to upgrade-dependencies March 3, 2022 00:49
@teor2345 teor2345 requested review from a team as code owners March 3, 2022 00:49
@codecov
Copy link

codecov bot commented Mar 3, 2022

Codecov Report

Merging #3716 (f0bd0c7) into upgrade-dependencies (762c3c1) will increase coverage by 0.14%.
The diff coverage is n/a.

@@                   Coverage Diff                    @@
##           upgrade-dependencies    #3716      +/-   ##
========================================================
+ Coverage                 78.94%   79.09%   +0.14%     
========================================================
  Files                       290      290              
  Lines                     33246    33247       +1     
========================================================
+ Hits                      26247    26296      +49     
+ Misses                     6999     6951      -48     

Copy link
Member

@upbqdn upbqdn left a comment

Choose a reason for hiding this comment

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

It looks great, thanks for correcting the color-eyre ignore as well.

@upbqdn upbqdn merged commit b716627 into upgrade-dependencies Mar 3, 2022
@upbqdn upbqdn deleted the upgrade-dependencies-ignore branch March 3, 2022 11:19
teor2345 added a commit that referenced this pull request Mar 7, 2022
* Upgrade some dependencies

* Upgrade some dependencies

* Upgrade dependencies for zebrad

* Upgrade tracing dependencies

* Revert `tor` & `arti`

* Upgrade `criterion` & `pin-project` in `deny.toml`

* Remove some dependencies from `skip-tree` in `deny.toml`

* Revert some the versions of dependencies because of duplicates

* Revert proptest regressions

* Upgrade dependencies, then ignore some more duplicates (#3716)

* feat(actions)!: add full sync test (#3582)

* add(tests): full sync test

* fix(test): add build

* fix(deploy): escape double dashes '--' correctly

* fix(test): remove unexpected --no-capture arg

error: Found argument '--nocapture' which wasn't expected, or isn't valid in this context

* refactor(docker): use default executable as entrypoint

* refactor(startup): add a custom entrypoint

* fix(test): add missing TEST_FULL_SYNC variable

* test(timeout): use the biggest machine

* fix

* fix(deploy): use latest successful image

* typo

* refactor(docker): generate config file at startup

* revert(build): changes were made to docker

* fix(docker): send variables correctly to the entrypoint

* test different conf file approach

* fix(env): add RUN_TEST env variable

* ref: use previous approach

* fix(color): use environment variable

* fix(resources): use our normal machine size

* fix(ci): double CPU and RAM for full sync test

* fix(test): check for zebrad test output in the correct order

The mempool is only activated once, so we must check for that log first.
After mempool activation, the stop regex is logged at least once.
(It might be logged before as well, but we can't rely on that.)

When checking that the mempool didn't activate,
wait for the `zebrad` command to exit,
then check the entire log.

* fix(ci): run full sync test with full compiler optimisations

* fix(tests): reintroduce tests and run full sync on approval

* fix(tests): reduce the changelog

Co-authored-by: teor <teor@riseup.net>

* fix(ci): update CI job path triggers (#3692)

* ci(test): re-run tests when snapshot data changes

* fix(ci): rebuild state when disk format changes

* fix(ci): rebuild rust docs when code or dependencies change

* doc(ci): explain why we run jobs when files change

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>

* fix(build): use the right multistage target (#3700)

* fix(review): only assign one reviewer to general Rust reviews (#3708)

If we assign two teams, GitHub assigns two reviewers.

* fix(ci): change the color-eyre ignore to a tracing-subscriber ignore

* fix(ci): ignore duplicate darling dependencies

* doc(ci): remove an alternative resolution doc

Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>

Co-authored-by: teor <teor@riseup.net>
Co-authored-by: Gustavo Valverde <gustavo@iterativo.do>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-dependencies Area: Dependency file updates A-devops Area: Pipelines, CI/CD and Dockerfiles
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants