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

Bump tokio from 1.38.0 to 1.39.2 #2648

Merged
merged 2 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
- uses: Swatinem/rust-cache@v2
- name: Install cargo-llvm-cov
uses: taiki-e/install-action@cargo-llvm-cov
- name: Print docker-compose version
run: docker-compose --version
- name: Print docker compose version
run: docker compose --version

- name: run ${{ matrix.kind }} tests
run: cargo llvm-cov run -p tremor-cli --lcov --output-path lcov.txt -- test --timeout 300 ${{ matrix.kind }} tremor-cli/tests --excludes tcp-reuseport
Expand Down
18 changes: 9 additions & 9 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tremor-system = { path = "tremor-system", version = "0.13.0-rc.29" }
tremor-value = { path = "tremor-value", version = "0.13.0-rc.29" }
tremor-archive = { path = "tremor-archive", version = "0.13.0-rc.29" }

tokio = { version = "1.38", features = ["full"] }
tokio = { version = "1.39", features = ["full"] }
tokio-stream = "0.1"
anyhow = "1"
async-trait = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ help:
###############################################################################

image:
docker-compose build
docker compose build

demo: image
-docker-compose -f demo/demo.yaml rm -fsv
-docker-compose -f demo/demo.yaml up
-docker-compose -f demo/demo.yaml rm -fsv
-docker compose -f demo/demo.yaml rm -fsv
-docker compose -f demo/demo.yaml up
-docker compose -f demo/demo.yaml rm -fsv

it-clean:
-find tremor-cli/tests -name '*.log' | xargs rm
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ We publish our images with a set of different tags as explained below

### Building the Docker Image

Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker-compose build`. Both will create an image called `tremorproject/tremor:latest`.
Tremor runs in a docker image. If you wish to build a local image, clone this repository, and either run `make image` or run `docker compose build`. Both will create an image called `tremorproject/tremor:latest`.

Note that since the image is building tremor in release mode it requires some serious resources. We recommend allowing docker to use at least **12 but better 16 gigabytes of memory** and as many cores as there are to spare. Depending on the system building, the image can take up to an hour.

Expand Down
2 changes: 1 addition & 1 deletion tremor-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ log = "0.4"
serde = "1"
serde_yaml = "0.9"
simd-json = "0.13"
tokio = { version = "1.38", features = ["full"] }
tokio = { version = "1.39", features = ["full"] }
# we don't need sessions or cookies or shitty logging middleware
tide = { version = "0.16", default-features = false, features = ["h1-server"] }
tremor-pipeline = { version = "0.13.0-rc.29", path = "../tremor-pipeline" }
Expand Down
2 changes: 1 addition & 1 deletion tremor-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ matches = "0.1"
pretty_assertions = "1.4"

[dependencies]
tokio = { version = "1.38", features = ["full"] }
tokio = { version = "1.39", features = ["full"] }
anyhow = "1"
clap = { version = "4", features = ["color", "derive"] }
clap_complete = "4"
Expand Down
2 changes: 1 addition & 1 deletion tremor-codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.13.0-rc.29"
tremor-value = { version = "0.13.0-rc.29", path = "../tremor-value" }
tremor-common = { version = "0.13.0-rc.29", path = "../tremor-common" }
tremor-config = { version = "0.13.0-rc.29", path = "../tremor-config" }
tokio = { version = "1.38", features = ["full"] }
tokio = { version = "1.39", features = ["full"] }
async-trait = "0.1"
error-chain = "0.12"
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion tremor-connectors-aws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ serde = { version = "1.0", default-features = false, features = ["derive"] }
anyhow = { version = "1", default-features = false }
async-channel = { version = "2", default-features = false }
thiserror = { version = "1", default-features = false }
tokio = { version = "1.38", default-features = false }
tokio = { version = "1.39", default-features = false }
log = { version = "0.4", default-features = false }
simd-json = { version = "0.13", default-features = false }
value-trait = { version = "0.8", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion tremor-connectors-azure/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ anyhow = "1.0.83"
async-trait = "0.1.81"
url = "2.5.2"
reqwest = { version = "0.12.4", default-features = false, features = ["json"] }
tokio = "1.37.0"
tokio = "1.39.2"
log = "0.4.21"
tremor-script = { version = "0.13.0-rc.29", path = "../tremor-script" }
bytes = "1.6.1"
Expand Down
4 changes: 2 additions & 2 deletions tremor-connectors-gcp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ googapis = { version = "0.6", default-features = true, features = [
gouth = { version = "0.2", default-features = true }
prost = { version = "0.9.0", default-features = true }
prost-types = { version = "0.9.0", default-features = true }
tokio = { version = "1.38", default-features = true }
tokio = { version = "1.39", default-features = true }
tonic = { version = "0.6.1", default-features = true, features = [
"transport",
"tls",
Expand Down Expand Up @@ -66,7 +66,7 @@ hyper = { version = "0.14", default-features = true, features = [
"http2",
"runtime",
] }
tokio = { version = "1.38", default-features = true }
tokio = { version = "1.39", default-features = true }
value-trait = { version = "0.8" }
test-case = { version = "3", default-features = true }
anyhow = { version = "1" }
Expand Down
4 changes: 2 additions & 2 deletions tremor-connectors-otel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ log = { version = "0.4", default-features = true }
serde = { version = "1.0", default-features = true, features = ["derive"] }
thiserror = { version = "1", default-features = true }
# value-trait = { version = "0.8", default-features = true }
tokio = { version = "1.38", default-features = false }
tokio = { version = "1.39", default-features = false }
simd-json = { version = "0.13", default-features = true }

# opentelemetry
Expand All @@ -45,7 +45,7 @@ async-channel = { version = "1.9", default-features = false }
hex = { version = "0.4", default-features = false, features = ["alloc", "std"] }

[dev-dependencies]
tokio = { version = "1.38", default-features = true }
tokio = { version = "1.39", default-features = true }
proptest = "1.5"
test-case = "3"

Expand Down
4 changes: 2 additions & 2 deletions tremor-connectors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tremor-script = { path = "../tremor-script", version = "0.13.0-rc.29" }
tremor-value = { path = "../tremor-value", version = "0.13.0-rc.29" }
tremor-interceptor = { path = "../tremor-interceptor", version = "0.13.0-rc.29" }
tremor-system = { path = "../tremor-system", version = "0.13.0-rc.29" }
tokio = { version = "1.38", default-features = false }
tokio = { version = "1.39", default-features = false }
beef = { version = "0.5", default-features = false }
value-trait = { version = "0.8", default-features = false }
futures = { version = "0.3.30", default-features = false, features = ["std"] }
Expand Down Expand Up @@ -165,7 +165,7 @@ tempfile = { version = "3.8", default-features = false }
env_logger = "0.11"
tremor-connectors-test-helpers = { path = "../tremor-connectors-test-helpers", version = "0.13.0-rc.29" }
tide = { version = "0.16", default-features = false } # TODO remove tide from TestHttpServer
tokio = { version = "1.38", default-features = false, features = [
tokio = { version = "1.39", default-features = false, features = [
"full",
"test-util",
] }
Expand Down
2 changes: 1 addition & 1 deletion tremor-pipeline/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fenster = { version = "0.1.1" }
criterion = "0.5"
tempfile = "3.8"
xz2 = "0.1"
tokio = { version = "1.38", features = ["full"] }
tokio = { version = "1.39", features = ["full"] }

[features]
bert = ["rust-bert"]
2 changes: 1 addition & 1 deletion tremor-system/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ authors = ["The Tremor Team"]
tremor-common = { path = "../tremor-common", version = "0.13.0-rc.29" }
tremor-script = { path = "../tremor-script", version = "0.13.0-rc.29" }

tokio = { version = "1.38", default-features = false }
tokio = { version = "1.39", default-features = false }
anyhow = { version = "1.0", default-features = true }
log = { version = "0.4", default-features = false }
serde = { version = "1.0", default-features = false }
Expand Down
Loading