From f578e2baf48879c637cbe589cdf5ea87790f32d1 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Tue, 10 Oct 2023 22:26:35 +0800 Subject: [PATCH] Change archive name and logger level --- .github/workflows/release.yml | 8 ++++++- Cargo.lock | 42 +++++++++++++++++------------------ Cargo.toml | 2 +- apiserver/src/main.rs | 2 +- syncer/src/main.rs | 2 +- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7e8323..733d587 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,22 +30,28 @@ jobs: include: - os: ubuntu-latest target: x86_64-unknown-linux-gnu + platform: linux-amd64 - os: ubuntu-latest target: aarch64-unknown-linux-gnu + platform: linux-arm64 - os: macos-latest target: x86_64-apple-darwin + platform: darwin-amd64 - os: macos-latest target: aarch64-apple-darwin + platform: darwin-arm64 - os: windows-latest target: x86_64-pc-windows-msvc + platform: windows-amd64 # - os: windows-latest # target: aarch64-pc-windows-msvc +# platform: windows-arm64 steps: - uses: actions/checkout@v4 - uses: taiki-e/install-action@cross - uses: taiki-e/upload-rust-binary-action@v1 with: bin: amp-apiserver,amp-controllers,amp-crdgen,amp-syncer - archive: amphitheatre-$tag-$target + archive: amphitheatre-${{ matrix.platform }} target: ${{ matrix.target }} token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 252e5c4..d70fddb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "amp-apiserver" -version = "0.5.5" +version = "0.5.6" dependencies = [ "amp-common", "amp-resources", @@ -122,7 +122,7 @@ dependencies = [ [[package]] name = "amp-controllers" -version = "0.5.5" +version = "0.5.6" dependencies = [ "amp-common", "amp-resolver", @@ -159,7 +159,7 @@ dependencies = [ [[package]] name = "amp-resolver" -version = "0.5.5" +version = "0.5.6" dependencies = [ "amp-common", "amp-resources", @@ -173,7 +173,7 @@ dependencies = [ [[package]] name = "amp-resources" -version = "0.5.5" +version = "0.5.6" dependencies = [ "amp-common", "k8s-metrics", @@ -192,7 +192,7 @@ dependencies = [ [[package]] name = "amp-syncer" -version = "0.5.5" +version = "0.5.6" dependencies = [ "amp-common", "async-nats", @@ -1456,9 +1456,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -1474,9 +1474,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7765dccf8c39c3a470fc694efe322969d791e713ca46bc7b5c506886157572" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" dependencies = [ "serde", "serde_json", @@ -2183,14 +2183,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.9", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.0", ] [[package]] @@ -2204,13 +2204,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.0", ] [[package]] @@ -2221,9 +2221,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" [[package]] name = "reqwest" @@ -2284,9 +2284,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" dependencies = [ "cc", "getrandom", @@ -3538,7 +3538,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.2", + "ring 0.17.3", "untrusted 0.9.0", ] diff --git a/Cargo.toml b/Cargo.toml index bdce6cd..74e8194 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.5.5" +version = "0.5.6" edition = "2021" license = "Apache-2.0" repository = "https://github.com/amphitheatre-app/amphitheatre" diff --git a/apiserver/src/main.rs b/apiserver/src/main.rs index d5e67e2..721347f 100644 --- a/apiserver/src/main.rs +++ b/apiserver/src/main.rs @@ -26,7 +26,7 @@ use tracing_subscriber::EnvFilter; #[tokio::main] async fn main() -> anyhow::Result<()> { let filter = EnvFilter::builder() - .with_default_directive(LevelFilter::TRACE.into()) + .with_default_directive(LevelFilter::INFO.into()) .from_env_lossy(); tracing_subscriber::fmt().with_env_filter(filter).init(); diff --git a/syncer/src/main.rs b/syncer/src/main.rs index 268d9a3..62f1940 100644 --- a/syncer/src/main.rs +++ b/syncer/src/main.rs @@ -31,7 +31,7 @@ mod handle; #[tokio::main] async fn main() -> Result<(), async_nats::Error> { let filter = EnvFilter::builder() - .with_default_directive(LevelFilter::TRACE.into()) + .with_default_directive(LevelFilter::INFO.into()) .from_env_lossy(); tracing_subscriber::fmt().with_env_filter(filter).init();