From a95a3c11fb45edb444b2bad15152678bd0d94157 Mon Sep 17 00:00:00 2001 From: Neshura Date: Wed, 7 Aug 2024 20:34:21 +0200 Subject: [PATCH] Test --- .forgejo/workflows/build+release.yml | 4 ++-- .forgejo/workflows/pull-requests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index cbb18db..c66810a 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -70,9 +70,9 @@ jobs: cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} - DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") + DEBIAN_REV=$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} - DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | tail -n1 | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb - diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 77f1b31..f6bf3c8 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -61,7 +61,7 @@ jobs: DEBIAN_REV=$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_REV: $DEBIAN_REV - DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | tail -n1 | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_NAME: $DEBIAN_NAME