From 1ef874b092c146f4955be1556dfd6b0e72cf42df Mon Sep 17 00:00:00 2001 From: Neshura Date: Thu, 28 Dec 2023 23:03:43 +0100 Subject: [PATCH] Fix Debian replacing - with ~ --- .forgejo/workflows/build+release.yml | 20 +++++++++++--------- Cargo.toml | 2 ++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index c294c74..c1e227a 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -62,20 +62,21 @@ jobs: name: Compiling To Linux Target run: | cargo build -r - mv target/release/cloudflare-dns-updater cloudflare-dns-updater-linux-amd64 + mv target/release/${{ github.event.repository.name }} ${{ github.event.repository.name }}-linux-amd64 - name: Bundle .deb package run: | cargo deb - mv target/debian/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) + mv target/debian/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: name: release_blobs path: | - cloudflare-dns-updater-linux-amd64 - cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb + ${{ github.event.repository.name }}-linux-amd64 + ${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb if-no-files-found: error upload-release: @@ -90,19 +91,20 @@ jobs: name: Upload Binary run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ + --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater-linux-amd64 \ + --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-linux-amd64 - name: Upload Debian Package run: | + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - ~) echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_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/cloudflare-dns-updater_${{ github.ref_name }}-1_amd64.deb \ + --upload-file release_blobs/${{ github.event.repository.name }}_$DEBIAN_REF-1_amd64.deb \ https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload - name: Release New Version @@ -112,4 +114,4 @@ jobs: url: https://forgejo.neshweb.net release-dir: release_blobs token: ${{ secrets.FORGEJO_TOKEN }} - tag: ${{ github.ref_name }} \ No newline at end of file + tag: ${{ github.ref_name }} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 9e192e1..288413b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,8 @@ authors = ["Neshura"] name = "cloudflare-dns-updater" version = "1.1.1-rc.2" edition = "2021" +description = "Application for automatically updating Cloudflare DNS records" +license = "" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html