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 and repo maintenance #3264

Merged
merged 6 commits into from
Jan 2, 2024
Merged

Conversation

robgjansen
Copy link
Member

@robgjansen robgjansen commented Jan 1, 2024

Closes #3197

@robgjansen robgjansen added this to the Code health and maintenance milestone Jan 1, 2024
@robgjansen robgjansen self-assigned this Jan 1, 2024
@github-actions github-actions bot added Component: Testing Unit and integration tests and frameworks Component: Build Build/install tools and dependencies labels Jan 1, 2024
@github-actions github-actions bot added Component: Libraries Support functions like LD_PRELOAD and logging Component: Main Composing the core Shadow executable Component: Documentation In-repository documentation, under docs/ labels Jan 1, 2024
@robgjansen
Copy link
Member Author

robgjansen commented Jan 1, 2024

@stevenengler any hints on how to fix https://github.com/shadow/shadow/actions/runs/7380020507/job/20076929685?pr=3264#step:5:328 ?

Adding the ref & as recommended by the compiler yields

the trait bound `i32: AsFd` is not satisfied
the following other types implement trait `AsFd`:
  Box<T>
  File
  PollFd<'fd>
  Stdin
  StdinLock<'a>
  Stdout
  StdoutLock<'a>
  Stderr
and 23 othersrustc[Click for full compiler diagnostic](rust-analyzer-diagnostics-view:/diagnostic%20message%20%5B2%5D?2#file%3A%2F%2F%2Fhome%2Frjansen%2Fdev%2Fshadow%2Fsrc%2Ftest%2Ftest_utils.rs)
test_utils.rs(296, 25): required by a bound introduced by this call
poll.rs(39, 20): required by a bound in `PollFd::<'fd>::new`

@stevenengler
Copy link
Contributor

stevenengler commented Jan 1, 2024

Yeah that would be a pain to fix. See #3141 #3265.

I would just manually edit src/tests/Cargo.toml and set the nix version back to what it was originally. You might need to also run cargo update again to update the lock file.

@robgjansen robgjansen changed the title Some minor ci and repo maintenance tasks CI and repo maintenance Jan 1, 2024
@robgjansen robgjansen force-pushed the repo-maintenance branch 2 times, most recently from ccdbbf2 to 89db7b2 Compare January 2, 2024 01:23
@robgjansen
Copy link
Member Author

Before merging, I will remove fedora:37 and tor-0.4.8.7 from the required checks, and change fedora:38 and tor-0.4.8.10 from optional to required.

@robgjansen robgjansen merged commit 8ad0cb6 into shadow:main Jan 2, 2024
24 checks passed
@robgjansen robgjansen deleted the repo-maintenance branch January 2, 2024 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Build Build/install tools and dependencies Component: Documentation In-repository documentation, under docs/ Component: Libraries Support functions like LD_PRELOAD and logging Component: Main Composing the core Shadow executable Component: Testing Unit and integration tests and frameworks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update versions of tools used in CI
2 participants