From bcf92e62dba20bc51cddc841d762293b9d2a71ce Mon Sep 17 00:00:00 2001 From: Neshura Date: Wed, 7 Aug 2024 20:46:10 +0200 Subject: [PATCH] Test --- .forgejo/workflows/build+release.yml | 65 +++++++++++++++------------- .forgejo/workflows/pull-requests.yml | 8 ++-- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index c66810a..3717f74 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -11,14 +11,13 @@ jobs: runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest steps: - - - name: Add Clippy + - name: Add Clippy run: rustup component add clippy - - - name: Checking Out Repository Code + + - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 - - - name: Set Up Cargo Cache + + - name: Set Up Cargo Cache uses: actions/cache@v3 with: path: | @@ -28,11 +27,11 @@ jobs: ~/.cargo/git/db/ target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: Run Clippy + + - name: Run Clippy run: cargo clippy - - - name: Check if Version in Cargo.toml matches Tag + + - name: Check if Version in Cargo.toml matches Tag run: | VERSION=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " ") if test $VERSION != "${{ github.ref_name }}"; then @@ -52,31 +51,37 @@ jobs: DEBIAN_REV: ${{ steps.deb_bundle.outputs.debian_rev }} DEBIAN_REF: ${{ steps.deb_bundle.outputs.debian_ref }} steps: - - - name: Checking Out Repository Code + - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 - - - name: Prepare build environment + + - name: Prepare build environment run: mkdir dist - - - name: Compiling To Linux Target + + - name: Compiling To Linux Target run: | cargo build -r mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64 - - - name: Bundle .deb package - id: deb_bundle + + - name: Collect Debian Metadata + id: deb run: | - cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} + echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT + echo DEBIAN_REF: $DEBIAN_REF 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" >> $GITHUB_OUTPUT + echo DEBIAN_REV: $DEBIAN_REV 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 - - - name: Uploading Build Artifact + echo "debian_name=$DEBIAN_NAME" >> $GITHUB_OUTPUT + echo DEBIAN_NAME: $DEBIAN_NAME + + - name: Bundle .deb package + run: | + DEBIAN_FILE=$(echo ${{ steps.deb.outputs.debian_name }}_${{ steps.deb.outputs.debian_ref }}-${{ steps.deb.outputs.debian_rev }}_amd64.deb) + echo mv target/debian/$DEBIAN_FILE dist/$DEBIAN_FILE + mv target/debian/$DEBIAN_FILE dist/$DEBIAN_FILE + + - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: name: release_blobs @@ -88,11 +93,10 @@ jobs: if: success() runs-on: docker steps: - - - name: Downloading All Build Artifacts + - name: Downloading All Build Artifacts uses: actions/download-artifact@v3 - - - name: Upload Binary + + - name: Upload Binary run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ --upload-file release_blobs/${{ github.event.repository.name }}-linux-amd64 \ @@ -108,6 +112,7 @@ jobs: steps: - name: Downloading All Build Artifacts uses: actions/download-artifact@v3 + - name: Upload Debian Package to staging run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 4f43e39..d7f7078 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -56,20 +56,20 @@ jobs: id: deb run: | DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} + echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT echo DEBIAN_REF: $DEBIAN_REF 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" >> $GITHUB_OUTPUT echo DEBIAN_REV: $DEBIAN_REV 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" >> $GITHUB_OUTPUT echo DEBIAN_NAME: $DEBIAN_NAME - name: Bundle .deb package run: | DEBIAN_FILE=$(echo ${{ steps.deb.outputs.debian_name }}_${{ steps.deb.outputs.debian_ref }}-${{ steps.deb.outputs.debian_rev }}_amd64.deb) echo mv target/debian/$DEBIAN_FILE dist/$DEBIAN_FILE - #mv target/debian/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb dist/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb + mv target/debian/$DEBIAN_FILE dist/$DEBIAN_FILE - name: Uploading Build Artifact uses: actions/upload-artifact@v3