From 85d27c8c9579efa0f4c8378ec25e4b7ad66be753 Mon Sep 17 00:00:00 2001 From: Iipin <52832022+Iipin@users.noreply.github.com> Date: Wed, 1 Nov 2023 08:59:01 +0100 Subject: [PATCH 1/2] chore: 1st day of month dependency bump --- .github/workflows/docker-publish.yml | 12 ++-- Cargo.lock | 95 ++++++++++++++++++---------- Cargo.toml | 10 +-- chombot-kcc.dockerfile | 2 +- chombot.dockerfile | 2 +- chombot/Cargo.toml | 4 +- 6 files changed, 78 insertions(+), 47 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 60cb6cc..9c8842f 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6 + uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -27,12 +27,12 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7 + uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755 with: images: ${{ env.REGISTRY }}/riichi/chombot - name: Build and push Docker image - uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0 + uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2 with: context: . file: chombot.dockerfile @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6 + uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -59,12 +59,12 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7 + uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755 with: images: ${{ env.REGISTRY }}/riichi/chombot-kcc - name: Build and push Docker image - uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0 + uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2 with: context: . file: chombot-kcc.dockerfile diff --git a/Cargo.lock b/Cargo.lock index 9bfc4bd..dd43544 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,9 +121,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", @@ -325,9 +325,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" dependencies = [ "clap_builder", "clap_derive", @@ -335,9 +335,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" dependencies = [ "anstream", "anstyle", @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "color_quant" @@ -1438,7 +1438,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", "windows-targets", ] @@ -1692,6 +1692,15 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "regex" version = "1.9.6" @@ -1723,9 +1732,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes", @@ -1752,6 +1761,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -1839,9 +1849,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.38.15" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.0", "errno", @@ -2007,9 +2017,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] @@ -2026,9 +2036,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", @@ -2048,9 +2058,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2278,15 +2288,36 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] @@ -2402,9 +2433,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -2475,9 +2506,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.1" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc1433177506450fe920e46a4f9812d0c211f5dd556da10e731a0a3dfa151f0" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", @@ -2487,18 +2518,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.20.1" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca676d9ba1a322c1b64eb8045a5ec5c0cfb0c9d08e15e9ff622589ad5221c8fe" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.0.2", "serde", diff --git a/Cargo.toml b/Cargo.toml index 03acc11..10a909e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,16 +12,16 @@ lto = true [workspace.dependencies] anyhow = "1.0.75" -async-trait = "0.1.73" +async-trait = "0.1.74" chrono = { version = "0.4.28", features = ["serde"] } image = { version = "0.24.7", default-features = false, features = ["png"] } -reqwest = "0.11.20" +reqwest = "0.11.22" riichi_hand = "0.6.0" scraper = "0.17.1" -serde = "1.0.188" -tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] } +serde = "1.0.190" +tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] } slug = "0.1.4" -clap = { version = "4.4.6", features = ["derive", "env"] } +clap = { version = "4.4.7", features = ["derive", "env"] } env_logger = "0.10.0" log = "0.4.20" num-bigint = "0.4.4" diff --git a/chombot-kcc.dockerfile b/chombot-kcc.dockerfile index 328aea7..ec92d5b 100644 --- a/chombot-kcc.dockerfile +++ b/chombot-kcc.dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.72.1 as builder +FROM rust:1.73.0 as builder RUN USER=root cargo new --bin chombot diff --git a/chombot.dockerfile b/chombot.dockerfile index a86c542..9a8356e 100644 --- a/chombot.dockerfile +++ b/chombot.dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.72.1 as builder +FROM rust:1.73.0 as builder RUN USER=root cargo new --bin chombot diff --git a/chombot/Cargo.toml b/chombot/Cargo.toml index 062e0c6..fd6cbe3 100644 --- a/chombot/Cargo.toml +++ b/chombot/Cargo.toml @@ -25,8 +25,8 @@ env_logger.workspace = true num-bigint.workspace = true itertools.workspace = true poise.workspace = true -toml = "0.8.1" +toml = "0.8.6" chombot-common = { path = "../chombot-common" } [dev-dependencies] -tempfile = "3.8.0" +tempfile = "3.8.1" From dbef4947533af0cb2baba3c8133a859bdf6dfbf6 Mon Sep 17 00:00:00 2001 From: Iipin <52832022+Iipin@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:36:29 +0100 Subject: [PATCH 2/2] Address review comments --- .github/workflows/docker-publish.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 9c8842f..5cfebbb 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -27,12 +27,12 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/riichi/chombot - name: Build and push Docker image - uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2 + uses: docker/build-push-action@v5 with: context: . file: chombot.dockerfile @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -59,12 +59,12 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/riichi/chombot-kcc - name: Build and push Docker image - uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2 + uses: docker/build-push-action@v5 with: context: . file: chombot-kcc.dockerfile