From 54a9dc0fed28693ab90696967cbc622ed062fcd9 Mon Sep 17 00:00:00 2001 From: Boyd Johnson Date: Wed, 1 Dec 2021 07:03:32 -0600 Subject: [PATCH] Add metadata, update CD workflow for debian package This commit modifies the Makefile to have a new command make release-linux-musl-deb that packages a deb package and copies it to ./release/ --- .github/workflows/cd.yml | 12 ++++++++++-- Cargo.toml | 3 +++ Makefile | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7a0455d6ff..157ddd8d68 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -47,12 +47,19 @@ jobs: rustup target add x86_64-unknown-linux-musl sudo apt-get -qq install musl-tools + - name: Add cargo deb + if: matrix.os == 'ubuntu-latest' + run: | + cargo install cargo-deb + - name: Build Release Mac if: matrix.os == 'macos-latest' run: make release-mac - - name: Build Release Linux + - name: Build Release Linux + Debian package if: matrix.os == 'ubuntu-latest' - run: make release-linux-musl + run: | + make release-linux-musl + make release-linux-musl-deb - name: Build Release Win if: matrix.os == 'windows-latest' run: make release-win @@ -76,6 +83,7 @@ jobs: ./release/*.tar.gz ./release/*.zip ./release/*.msi + ./release/*.deb env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.toml b/Cargo.toml index fb7e870d9a..9a4a11846e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,3 +90,6 @@ opt-level = 3 [profile.dev] split-debuginfo = "unpacked" + +[package.metadata.deb] +depends = "" diff --git a/Makefile b/Makefile index 000e19e03a..84b6da09f3 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,10 @@ release-linux-musl: build-linux-musl-release mkdir -p release tar -C ./target/x86_64-unknown-linux-musl/release/ -czvf ./release/gitui-linux-musl.tar.gz ./gitui +release-linux-musl-deb: build-linux-musl-release + cargo deb --no-build --target x86_64-unknown-linux-musl + cp ./target/x86_64-unknown-linux-musl/debian/*.deb ./release/ + build-linux-musl-debug: cargo build --target=x86_64-unknown-linux-musl