From dc89007c513aeaeba9cab2e2bd742715b1a83426 Mon Sep 17 00:00:00 2001
From: KeisukeYamashita <19yamashita15@gmail.com>
Date: Tue, 3 Dec 2024 01:51:18 +0100
Subject: [PATCH] fix(cli): package name and dockerfile path

Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com>
---
 .github/workflows/release.yaml |  3 ++-
 Cargo.lock                     | 16 ++++++++--------
 cli/Cargo.toml                 |  2 +-
 schema/Cargo.toml              |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a57135e..ab5ce9e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -113,7 +113,8 @@ jobs:
 
       - uses: docker/build-push-action@v6
         with:
-          context: ./cli
+          context: .
+          file: ./cli/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Cargo.lock b/Cargo.lock
index 3179607..17178c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -155,7 +155,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
-name = "cli"
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "commitlint-rs"
 version = "0.2.0"
 dependencies = [
  "clap",
@@ -168,12 +174,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.17"
@@ -481,7 +481,7 @@ name = "schema"
 version = "0.2.0"
 dependencies = [
  "clap",
- "cli",
+ "commitlint-rs",
  "schemars",
  "serde",
  "serde_json",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 17ebbe2..362aed4 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cli"
+name = "commitlint-rs"
 description = "CLI tool to lint commits by Conventional Commits"
 documentation.workspace = true
 authors.workspace = true
diff --git a/schema/Cargo.toml b/schema/Cargo.toml
index 11b83b9..567aa99 100644
--- a/schema/Cargo.toml
+++ b/schema/Cargo.toml
@@ -13,7 +13,7 @@ edition.workspace = true
 
 [dependencies]
 clap = { version = "4.5.21", features = ["derive"] }
-cli = { path = "../cli", features = ["schemars"] }
+cli = { path = "../cli", features = ["schemars"], package = "commitlint-rs" }
 schemars = { version = "0.8.21" }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"