From d4e9a7e36ceaa1713d7493f2a3b05a65b05445a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 17 Dec 2023 11:07:12 -0700 Subject: [PATCH 1/4] chore(deps): Update pre-commit hooks (#277) Co-authored-by: fredclausen --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 72dce239..dce21373 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,7 @@ repos: # prettier - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v4.0.0-alpha.3-1" # Use the sha / tag you want to point at + rev: "v4.0.0-alpha.6" # Use the sha / tag you want to point at hooks: - id: prettier types_or: [file, bash, sh, javascript, jsx, ts, tsx] @@ -53,7 +53,7 @@ repos: # lint python formatting - repo: https://github.com/psf/black - rev: 23.11.0 + rev: 23.12.0 hooks: - id: black exclude: ^(acars_router/) From 49f3d132fa73b0027aa81b929930fd8da800ee12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:34:52 -0700 Subject: [PATCH 2/4] Bump rust from 1.74.0-bullseye to 1.74.1-bullseye (#274) Bumps rust from 1.74.0-bullseye to 1.74.1-bullseye. --- updated-dependencies: - dependency-name: rust dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Dockerfile.build_binary | 2 +- Dockerfile.local | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.build_binary b/Dockerfile.build_binary index 1b78e3fe..1897988c 100644 --- a/Dockerfile.build_binary +++ b/Dockerfile.build_binary @@ -1,4 +1,4 @@ -FROM rust:1.74.0-bullseye as builder +FROM rust:1.74.1-bullseye as builder ENV CARGO_NET_GIT_FETCH_WITH_CLI=true WORKDIR /tmp/acars_router # hadolint ignore=DL3008,DL3003,SC1091,DL3009 diff --git a/Dockerfile.local b/Dockerfile.local index 9b944f5c..60edbddb 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -1,4 +1,4 @@ -FROM rust:1.74.0-bullseye as builder +FROM rust:1.74.1-bullseye as builder WORKDIR /tmp/acars_router # hadolint ignore=DL3008,DL3003,SC1091 RUN set -x && \ From 795fd89553604a800d6c17a56bf8e7f596349a8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:35:04 -0700 Subject: [PATCH 3/4] Bump tokio from 1.34.0 to 1.35.0 (#275) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.34.0 to 1.35.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.34.0...tokio-1.35.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- rust/bin/acars_router/Cargo.toml | 2 +- rust/libraries/acars_connection_manager/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 498bd82e..6eb51ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1143,9 +1143,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", diff --git a/rust/bin/acars_router/Cargo.toml b/rust/bin/acars_router/Cargo.toml index 0e0d2611..cd563af9 100644 --- a/rust/bin/acars_router/Cargo.toml +++ b/rust/bin/acars_router/Cargo.toml @@ -13,7 +13,7 @@ rust-version.workspace = true [dependencies] log = "0.4.20" -tokio = { version = "1.34.0", features = ["full", "tracing"] } +tokio = { version = "1.35.0", features = ["full", "tracing"] } chrono = "0.4.31" serde = { version = "1.0.193", features = ["derive"] } serde_json = "1.0.108" diff --git a/rust/libraries/acars_connection_manager/Cargo.toml b/rust/libraries/acars_connection_manager/Cargo.toml index 42ee20f3..1f5de714 100644 --- a/rust/libraries/acars_connection_manager/Cargo.toml +++ b/rust/libraries/acars_connection_manager/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true [dependencies] sdre-stubborn-io = "0.4.4" log = "0.4.20" -tokio = { version = "1.34.0", features = ["full", "tracing"] } +tokio = { version = "1.35.0", features = ["full", "tracing"] } tokio-util = { version = "0.7.10", features = ["full"] } tokio-stream = "0.1.14" futures = "0.3.29" From 769ea2e15a0e8e471de5c4a25d8f030f5a0666f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 06:35:20 -0700 Subject: [PATCH 4/4] Bump actions/upload-artifact from 3 to 4 (#278) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/on_pr.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 545b2878..01929efa 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -75,7 +75,7 @@ jobs: outputs: type=local,dest=./image_armv7/ - name: Upload artifact armv7 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.armv7 path: ./image_armv7/acars_router @@ -115,7 +115,7 @@ jobs: outputs: type=local,dest=./image_arm64/ - name: Upload artifact arm64 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.arm64 path: ./image_arm64/acars_router @@ -155,7 +155,7 @@ jobs: outputs: type=local,dest=./image_amd64/ - name: Upload artifact amd64 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.amd64 path: ./image_amd64/acars_router diff --git a/.github/workflows/on_pr.yaml b/.github/workflows/on_pr.yaml index 0aec8f01..5118546d 100644 --- a/.github/workflows/on_pr.yaml +++ b/.github/workflows/on_pr.yaml @@ -139,7 +139,7 @@ jobs: outputs: type=local,dest=./image_armv7/ - name: Upload artifact armv7 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.armv7 path: ./image_armv7/acars_router @@ -179,7 +179,7 @@ jobs: outputs: type=local,dest=./image_arm64/ - name: Upload artifact arm64 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.arm64 path: ./image_arm64/acars_router @@ -219,7 +219,7 @@ jobs: outputs: type=local,dest=./image_amd64/ - name: Upload artifact amd64 binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: acars_router.amd64 path: ./image_amd64/acars_router