From a6b35ec48883a3da42f98f28c5bbba1dc6824314 Mon Sep 17 00:00:00 2001 From: Neshura Date: Wed, 7 Aug 2024 19:51:59 +0200 Subject: [PATCH] Formatting Changes --- .forgejo/workflows/build+release.yml | 17 ++++++-------- .forgejo/workflows/pull-requests.yml | 34 +++++++++++++--------------- .forgejo/workflows/test.yml | 15 ++++++------ 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index db97083..b3db383 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -106,11 +106,9 @@ jobs: if: success() runs-on: docker steps: - - - name: Downloading All Build Artifacts + - name: Downloading All Build Artifacts uses: actions/download-artifact@v3 - - - name: Upload Debian Package to staging + - name: Upload Debian Package to staging run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_'${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}'_amd64.deb \ @@ -118,8 +116,8 @@ jobs: curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ --upload-file release_blobs/${{ needs.build.outputs.debian_name }}_${{ needs.build.outputs.debian_ref }}${{ needs.build.outputs.debian_rev }}_amd64.deb \ ${{ env.GITHUB_API_URL }}/packages/${{ env.GITHUB_REPOSITORY_OWNER }}/debian/pool/bookworm/staging/upload - - - name: Upload Debian Package to main + + - name: Upload Debian Package to main if: (! contains(github.ref_name, '-rc')) run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ @@ -134,11 +132,10 @@ jobs: if: success() runs-on: docker steps: - - - name: Downloading All Build Artifacts + - name: Downloading All Build Artifacts uses: actions/download-artifact@v3 - - - name: Release New Version + + - name: Release New Version uses: actions/forgejo-release@v2 with: direction: upload diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index c1f4270..c3a4a63 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.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,8 +27,8 @@ jobs: ~/.cargo/git/db/ target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: Run Clippy + + - name: Run Clippy run: cargo clippy build: @@ -42,19 +41,18 @@ 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 + + - name: Bundle .deb package id: deb_bundle run: | cargo deb @@ -65,8 +63,8 @@ jobs: DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | 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 + + - name: Uploading Build Artifact uses: actions/upload-artifact@v3 with: name: release_blobs diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index 920821d..e50ef78 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -12,14 +12,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: | @@ -29,6 +28,6 @@ jobs: ~/.cargo/git/db/ target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - - name: Run Clippy + + - name: Run Clippy run: cargo clippy \ No newline at end of file