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

fix: Failing CI on main #24562

Merged
merged 8 commits into from
Jan 9, 2024
Merged

fix: Failing CI on main #24562

merged 8 commits into from
Jan 9, 2024

Conversation

mgattozzi
Copy link
Contributor

The following changes fix CI so that we can have main be green again and so that we can work while having our tests working. This is a followup to #24552 where we decided to get the code in and have this PR fix everything.

NOTE: This might not be working right now, but I wanted to get it open and check after fixing the easier things first.

@mgattozzi mgattozzi requested a review from pauldix January 9, 2024 18:24
@pauldix
Copy link
Member

pauldix commented Jan 9, 2024

For all the iox crates that have updates, are those changes you made or ones copied over from the IOx repo? I'm surprised those had any problems as all those were green at the point of getting copied over.

@mgattozzi
Copy link
Contributor Author

@pauldix Most were because of cargo-clippy wanting to be appeased. It might be fixed in the IOx repo already (if they enabled clippy like this repo), but am unsure. Most of the changes affected tests more than anything else.

This commit upgrades Rust to 1.75.0, the latest release. We also
upgraded our dependencies to stay up to date and to clear out any
uneeded deps from the lockfile. In order to make sure everything works
this also fixes the build by upgrading the workspace-hack crate using
cargo hikari and removing the `workspace.lint` that was in
influxdb3_write that didn't need to be there, probably from a merge
issue.

With this we can build influxdb3 as our default on main, but this alone
is not enough to fix CI and will be addressed in future commits.
This commit fixes the warnings emitted by `cargo build` when compiling
influxdb3. Mainly it adds needed lifetimes and removes uneccesary
imports and functions calls.
This for the most part just applies suggested fixes by clippy with a few
exceptions:

- Generated type crates had additional allows added since we can't
  control what code gets made
- Things that couldn't be automatically fixed were done so manually in
  particular adding a Send bound for traits that created a Future that
  should be Send

We also had to fix a build issue by adding a feature for tokio-compat
due to the upgrade of deps. The workspace crate was updated accordingly.
Inbetween rustc 1.72 and rustc 1.75 the way that error messages were
displayed when panicing changed. One of our tests depended on the output
of that behavior and this commit updates the error message to the new
form so that tests will pass.
This was the last change needed to make sure that the workspace-hack
crate CI lint would pass.
We removed iox code from this code base and as a result some tests
cannot be run anymore and so this commit removes them from the code base
so that we can get a green build.
@mgattozzi
Copy link
Contributor Author

@pauldix I did a force push to fix my author email not using my influxdata one and to get the checks to run without appveyor now. If all goes well we should be able to merge. I haven't made any other changes.

@mgattozzi mgattozzi merged commit 8ee13bc into main Jan 9, 2024
12 checks passed
@mgattozzi mgattozzi deleted the mgattozzi/fix-ci branch January 9, 2024 20:11
This was referenced Jan 10, 2024
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