From ef81edbaa66b1f162713bdb816d7ebe020bbaba2 Mon Sep 17 00:00:00 2001 From: Vincent Ruello <5345986+vruello@users.noreply.github.com> Date: Fri, 6 Sep 2024 17:24:38 +0200 Subject: [PATCH] Fix package build in release workflow --- .github/workflows/release-draft.yml | 6 ++++-- common/Cargo.toml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index 52a16f1..1d7708e 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -20,7 +20,8 @@ jobs: docker build -t openwec-builder:debian-bookworm -f Dockerfile-debian-bookworm . && \ docker run -t -u $(id -u):$(id -g) -v $(pwd)/../:/SRC \ --env CARGO_HOME=/SRC/target/.cargo openwec-builder:debian-bookworm \ - cargo deb --manifest-path=./common/Cargo.toml -- --locked && \ + sh -c "cargo build --release --locked && \ + cargo deb --no-build --manifest-path=./common/Cargo.toml" && \ for i in ../target/debian/*.deb; do mv "$i" "${i/.deb/_deb12.deb}"; done; - name: Upload debian bookworm package uses: actions/upload-artifact@v4 @@ -34,7 +35,8 @@ jobs: docker build -t openwec-builder:debian-bullseye -f Dockerfile-debian-bullseye . && \ docker run -t -u $(id -u):$(id -g) -v $(pwd)/../:/SRC \ --env CARGO_HOME=/SRC/target/.cargo openwec-builder:debian-bullseye \ - cargo deb --manifest-path=./common/Cargo.toml -- --locked && \ + sh -c "cargo build --release --locked && \ + cargo deb --no-build --manifest-path=./common/Cargo.toml" && \ for i in ../target/debian/*.deb; do mv "$i" "${i/.deb/_deb11.deb}"; done; - name: Upload debian bullseye package uses: actions/upload-artifact@v4 diff --git a/common/Cargo.toml b/common/Cargo.toml index 3a4f9a7..1cce879 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -4,6 +4,7 @@ version = "0.3.0" edition = "2021" # Used by cargo-deb homepage = "https://github.com/cea-sec/openwec" +description = "A Windows Event Collector server using WEF for GNU/Linux" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -35,6 +36,7 @@ serial_test = "3.0.0" name="openwec" maintainer = "CEA" copyright = "2023, CEA" +license-file = ["../LICENSE", "0"] extended-description = """\ An implementation of a Windows Event Collector \ server running on GNU/Linux."""