From 4c11c9f048f8b1154893e3383c6eb354f63bb8d1 Mon Sep 17 00:00:00 2001 From: strawberry Date: Mon, 13 May 2024 17:35:23 -0400 Subject: [PATCH] ci: use target-specific dirs for cargo-deb, fix cargo-deb paths Signed-off-by: strawberry --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 873b29bc..e0abde96 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -207,10 +207,11 @@ jobs: - name: Build static ${{ matrix.target }} run: | bin/nix-build-and-cache just .#static-${{ matrix.target }} - mkdir -p target/release - cp -v -f result/bin/conduit target/release/ - direnv exec . cargo deb --verbose --no-build --no-strip --target=${{ matrix.target }} --output target/debian/${{ matrix.target }}.deb - mv target/release/conduit 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=${{ matrix.target }} --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 - name: Upload static-${{ matrix.target }} uses: actions/upload-artifact@v4 @@ -223,7 +224,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: deb-${{ matrix.target }} - path: target/debian/${{ matrix.target }}.deb + path: ${{ matrix.target }}.deb if-no-files-found: error - name: Build OCI image ${{ matrix.target }}