Switch variable referencing style + change if condition check
All checks were successful
Run Tests on Code / run-tests (push) Successful in 13s

This commit is contained in:
Neshura 2023-12-29 02:49:38 +01:00
parent c62dd2ff39
commit 30cf1afba8
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C

View file

@ -67,7 +67,7 @@ jobs:
echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env echo "DEBIAN_REF=$DEBIAN_REF" >> dist/build.env
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" >> dist/build.env echo "DEBIAN_REV=$DEBIAN_REV" >> dist/build.env
mv target/debian/${{ github.event.repository.name }}_"$DEBIAN_REF""$DEBIAN_REV"_amd64.deb dist/${{ github.event.repository.name }}_"$DEBIAN_REF""$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 name: Uploading Build Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@ -95,25 +95,25 @@ jobs:
https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/generic/${{ github.event.repository.name }}/${{ github.ref_name }}/chellaris-rust-api-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 to main name: Upload Debian Package to main
if: ! echo ${{ github.ref_name }} | grep -qi '\-rc' if: !search(github.ref_name, '-rc')
run: | run: |
source release_blobs/build.env source release_blobs/build.env
echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
--upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$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' https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload'
curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
--upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$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 https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/main/upload
- -
name: Upload Debian Package to staging name: Upload Debian Package to staging
if: echo ${{ github.ref_name }} | grep -qi '\-rc' if: search(github.ref_name, '-rc')
run: | run: |
source release_blobs/build.env source release_blobs/build.env
echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
--upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$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' https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/staging/upload'
curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \
--upload-file release_blobs/${{ github.event.repository.name }}_"$DEBIAN_REF""$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 https://forgejo.neshweb.net/api/packages/${{ secrets.FORGEJO_USERNAME }}/debian/pool/bookworm/staging/upload
- -
name: Release New Version name: Release New Version