From 50c9677b8271d9df49fda8e46302ea2c47656944 Mon Sep 17 00:00:00 2001 From: Neshura Date: Fri, 29 Dec 2023 03:14:53 +0100 Subject: [PATCH] Revert env changes --- .forgejo/workflows/build+release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 1194a5a..306fe9f 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -67,7 +67,7 @@ jobs: echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "DEBIAN_REV=$DEBIAN_REV" >> dist/build.env - mv target/debian/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb dist/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb + mv target/debian/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb dist/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 @@ -99,10 +99,10 @@ jobs: run: | source release_blobs/build.env echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_'"$DEBIAN_REF""$DEBIAN_REV"'_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload - name: Upload Debian Package to staging @@ -110,10 +110,10 @@ jobs: run: | source release_blobs/build.env echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_'"$DEBIAN_REF""$DEBIAN_REV"'_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/staging/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ github.event.repository.name }}_${{ env.DEBIAN_REF }}${{ env.DEBIAN_REV }}_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/staging/upload - name: Release New Version