From 5069c88f774f56c352b89816d02afeb0954e6034 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Mon, 13 May 2024 22:14:38 -0400
Subject: [PATCH] ci: correct paths for debian package creation, use
`conduwuit`
Signed-off-by: strawberry <strawberry@puppygock.gay>
---
.github/workflows/ci.yml | 13 ++++++++-----
Cargo.toml | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7dc0584d0..df66516e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -209,11 +209,13 @@ jobs:
CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
bin/nix-build-and-cache just .#static-${{ matrix.target }}
- mkdir -p target/release/${{ matrix.target }}
- cp -v -f result/bin/conduit target/release/${{ matrix.target }}
- direnv exec . cargo deb --verbose --no-build --no-strip --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}/${{ matrix.target }}.deb
- mv -v target/release/${{ matrix.target }}/conduit static-${{ matrix.target }}
- mv -v target/release/${{ matrix.target }}/${{ matrix.target }}.deb ${{ matrix.target }}.deb
+ mkdir -v -p target/release/
+ mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
+ cp -v -f result/bin/conduit target/release/conduwuit
+ cp -v -f result/bin/conduit target/$CARGO_DEB_TARGET_TUPLE/release/conduwuit
+ direnv exec . cargo deb --verbose --no-build --no-strip --target=$CARGO_DEB_TARGET_TUPLE --output target/release/${{ matrix.target }}.deb
+ mv -v target/release/conduwuit static-${{ matrix.target }}
+ mv -v target/release/${{ matrix.target }}.deb ${{ matrix.target }}.deb
- name: Upload static-${{ matrix.target }}
uses: actions/upload-artifact@v4
@@ -228,6 +230,7 @@ jobs:
name: deb-${{ matrix.target }}
path: ${{ matrix.target }}.deb
if-no-files-found: error
+ compression-level: 0
- name: Build OCI image ${{ matrix.target }}
run: |
diff --git a/Cargo.toml b/Cargo.toml
index 9ca75672b..9a4f40fd6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -448,7 +448,7 @@ assets = [
"644",
],
[
- "target/release/conduit",
+ "target/release/conduwuit",
"usr/sbin/conduwuit",
"755",
],
--
GitLab