Skip to content

Commit

Permalink
update rust version in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
williamhbaker committed Dec 12, 2024
1 parent 9c16563 commit ad5abfc
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/connectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
uses: actions-rs/toolchain@v1
if: needs.paths-filter.outputs.atf_modified == 'true'
with:
toolchain: nightly-2023-04-16
toolchain: stable
target: x86_64-unknown-linux-musl
default: true
override: true
Expand Down
68 changes: 22 additions & 46 deletions airbyte-to-flow/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions airbyte-to-flow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ clap = { version = "^3", features = ["derive"] }
futures = "*"
futures-core = "*"
futures-util = "*"
prost = "0.12"
prost = "0.13"
schemars = "0.8"
serde = { version = "*", features = ["derive"]}
serde_json = { version = "*", features = ["raw_value"]}
serde = { version = "*", features = ["derive"] }
serde_json = { version = "*", features = ["raw_value"] }
structopt = "*"
strum_macros = "*"
strum = { version = "0.24.1", features = ["derive"] }
Expand Down
13 changes: 10 additions & 3 deletions airbyte-to-flow/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::Context;
use clap::{Parser, ValueEnum};
use clap::Parser;
use errors::Error;
use flow_cli_common::{init_logging, LogArgs, LogLevel};

Expand Down Expand Up @@ -36,7 +36,14 @@ fn main() -> anyhow::Result<()> {

let log_level = std::env::var("LOG_LEVEL")
.ok()
.and_then(|s| LogLevel::from_str(&s, true).ok())
.and_then(|s| match s.as_str() {
"trace" => Some(LogLevel::Trace),
"debug" => Some(LogLevel::Debug),
"info" => Some(LogLevel::Info),
"warn" => Some(LogLevel::Warn),
"error" => Some(LogLevel::Error),
_ => None,
})
.unwrap_or(LogLevel::Info);
let log_args = LogArgs {
level: log_level,
Expand Down Expand Up @@ -64,7 +71,7 @@ fn main() -> anyhow::Result<()> {
match result {
Err(Error::ExitCode(code)) => {
std::process::exit(code);
},
}
Err(err) => Err(err.into()),
Ok(()) => {
tracing::debug!(message = "atf exiting");
Expand Down

0 comments on commit ad5abfc

Please sign in to comment.