From 595da9e735c9c8e526a8512640e6199c5bc395cb Mon Sep 17 00:00:00 2001
From: Riey <creeper844@gmail.com>
Date: Tue, 19 Jan 2021 03:46:26 +0900
Subject: [PATCH] Update release.yaml

---
 .github/workflows/release.yaml | 14 ++++++--------
 engine/capi/Cargo.toml         | 12 ------------
 gtk3/Cargo.toml                | 10 ----------
 pkg/control.in                 |  2 +-
 xim/Cargo.toml                 | 11 -----------
 5 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4b89db91..cd48ab97 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -14,12 +14,12 @@ jobs:
     
     steps:
       - uses: actions/checkout@v2
+      - name: Set VER
+        run: export VER=$(grep '^version =' gtk3/Cargo.toml|head -n1|cut -d\" -f2)
       - name: Update apt
         run: sudo apt-get update -y
       - name: Install packages
         run: sudo apt-get install -y pkg-config libpango1.0-dev libcairo2-dev libgtk-3-dev libglib2.0 libxcb1
-      - name: Install cargo-deb
-        run: cargo install cargo-deb
 
       - name: Generate package...
         run: pkg/release.sh
@@ -27,8 +27,6 @@ jobs:
         run: 7z a build/kime.7z ./build/out/*
       - name: Generate deb package...
         run: pkg/release-deb.sh
-      - name: Archiving deb package...
-        run: 7z a build/kime-deb.7z ./build/deb/*
 
       - name: Create draft release
         id: create_release
@@ -48,7 +46,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: build/kime.7z
-          asset_name: kime-${{ github.ref }}.7z
+          asset_name: kime-${VER}.7z
           asset_content_type: application/x-7z-compressed
 
       - name: Upload deb package
@@ -57,7 +55,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/kime-deb.7z
-          asset_name: kime-dev-${{ github.ref }}.7z
-          asset_content_type: application/x-7z-compressed
+          asset_path: build/deb/kime_${VER}_amd64.deb
+          asset_name: kime_${VER}_amd64.deb
+          asset_content_type: application/x-xz
   
diff --git a/engine/capi/Cargo.toml b/engine/capi/Cargo.toml
index 02854383..cb19bea5 100644
--- a/engine/capi/Cargo.toml
+++ b/engine/capi/Cargo.toml
@@ -17,15 +17,3 @@ kime-engine-core = { path = "../core" }
 kime-engine-core = { path = "../core" }
 serde_yaml = "0.8.15"
 
-[package.metadata.deb]
-name = "kime-engine"
-maintainer = "Riey"
-copyright = "2021, Riey <creeper844@gmail.com>"
-depends = ""
-provides = "kime-engine"
-conflicts = "kime-engine"
-
-assets = [
-    ["target/release/libkime_engine.so", "usr/lib", "755"],
-    ["data/config.yaml", "etc/kime", "644"],
-]
diff --git a/gtk3/Cargo.toml b/gtk3/Cargo.toml
index 61bda339..5fea59da 100644
--- a/gtk3/Cargo.toml
+++ b/gtk3/Cargo.toml
@@ -19,13 +19,3 @@ pango-sys = "0.10.0"
 
 kime-engine-cffi = { path = "../engine/cffi" }
 
-[package.metadata.deb]
-name = "kime-gtk3"
-maintainer = "Riey"
-copyright = "2021, Riey <creeper844@gmail.com>"
-depends = "gtk+3.0,libpango-1.0,libglib2.0,kime-engine"
-provides = "kime-gtk3"
-conflicts = "kime-gtk3"
-assets = [
-    ["target/release/libkime_gtk3.so", "usr/gtk-3.0/3.0.0/immodules", "755"],
-]
diff --git a/pkg/control.in b/pkg/control.in
index 8bc48647..88e726fb 100644
--- a/pkg/control.in
+++ b/pkg/control.in
@@ -6,5 +6,5 @@ Homepage: https://github.com/Riey/kime
 Section: utils
 Priority: optional
 Architecture: amd64
-Depends: libpango1.0-dev libcairo2-dev libgtk-3-dev libglib2.0 libxcb1
+Depends: libpango1.0-dev, libcairo2-dev, libgtk-3-dev, libglib2.0, libxcb1
 
diff --git a/xim/Cargo.toml b/xim/Cargo.toml
index a59f1527..5d36acbf 100644
--- a/xim/Cargo.toml
+++ b/xim/Cargo.toml
@@ -18,14 +18,3 @@ xim = { git = "https://github.com/Riey/xim-rs", default-features = false, featur
 
 kime-engine-cffi = { path = "../engine/cffi" }
 
-[package.metadata.deb]
-name = "kime-xim"
-maintainer = "Riey"
-copyright = "2021, Riey <creeper844@gmail.com>"
-depends = "libxcb1,libcairo2,kime-engine"
-provides = "kime-xim"
-conflicts = "kime-xim"
-
-assets = [
-    ["target/release/kime-xim", "usr/bin", "755"],
-]