From 713bbb550a963874efd77c0d50b6240b8b6452e2 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:48:40 +0200 Subject: [PATCH 01/32] CI Cross-Job Var Fix Attempt --- .forgejo/workflows/build+release.yml | 12 ++++++++---- .forgejo/workflows/pull-requests.yml | 25 +++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 81de150..db97083 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -47,6 +47,10 @@ jobs: if: success() runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest + outputs: + DEBIAN_NAME: ${{ steps.deb_bundle.outputs.debian_name }} + DEBIAN_REV: ${{ steps.deb_bundle.outputs.debian_rev }} + DEBIAN_REF: ${{ steps.deb_bundle.outputs.debian_ref }} steps: - name: Checking Out Repository Code @@ -109,20 +113,20 @@ jobs: name: Upload Debian Package to staging run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_'${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}'_amd64.deb \ + --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' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}_amd64.deb \ + --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 if: (! contains(github.ref_name, '-rc')) run: | echo 'curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_'${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}'_amd64.deb \ + --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/main/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}_amd64.deb \ + --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/main/upload create-release: diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index d8db6cd..c1f4270 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -37,6 +37,10 @@ jobs: if: success() runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest + outputs: + DEBIAN_NAME: ${{ steps.deb_bundle.outputs.debian_name }} + DEBIAN_REV: ${{ steps.deb_bundle.outputs.debian_rev }} + DEBIAN_REF: ${{ steps.deb_bundle.outputs.debian_ref }} steps: - name: Checking Out Repository Code @@ -51,10 +55,15 @@ jobs: mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64 - name: Bundle .deb package + id: deb_bundle run: | cargo deb - DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) + echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") + echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} + 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 @@ -62,4 +71,16 @@ jobs: with: name: release_blobs path: dist - if-no-files-found: error \ No newline at end of file + if-no-files-found: error + + test-env: + needs: build + if: success() + runs-on: docker + steps: + - + name: Test Debian Variables + run: | + test ${{ needs.build.outputs.debian_name }} = $(echo ${{ github.ref_name }} | tr - \~) + test ${{ needs.build.outputs.debian_ref }} = $(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") + test ${{ needs.build.outputs.debian_rev }} = $(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") From a6b35ec48883a3da42f98f28c5bbba1dc6824314 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:51:59 +0200 Subject: [PATCH 02/32] 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 From 01b3a2028b7a50dce7d5ab8f416a3525acf8ce8f Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:52:08 +0200 Subject: [PATCH 03/32] Adjust Environment Variable Test --- .forgejo/workflows/pull-requests.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index c3a4a63..fa9573b 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -76,9 +76,11 @@ jobs: if: success() runs-on: docker steps: - - - name: Test Debian Variables + - name: Checking Out Repository Code + uses: https://code.forgejo.org/actions/checkout@v3 + + - name: Test Debian Variables run: | - test ${{ needs.build.outputs.debian_name }} = $(echo ${{ github.ref_name }} | tr - \~) - test ${{ needs.build.outputs.debian_ref }} = $(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") - test ${{ needs.build.outputs.debian_rev }} = $(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + test ${{ needs.build.outputs.debian_name }} = echo ${{ github.ref_name }} | tr - \~ + test ${{ needs.build.outputs.debian_ref }} = cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " " + test ${{ needs.build.outputs.debian_rev }} = cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " " From 27065c4b02132776d561939707b0b412f94931dd Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:55:19 +0200 Subject: [PATCH 04/32] Further Adjustments to Env Test --- .forgejo/workflows/pull-requests.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index fa9573b..cca5a96 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -76,11 +76,13 @@ jobs: if: success() runs-on: docker steps: - - name: Checking Out Repository Code - uses: https://code.forgejo.org/actions/checkout@v3 - - name: Test Debian Variables run: | - test ${{ needs.build.outputs.debian_name }} = echo ${{ github.ref_name }} | tr - \~ - test ${{ needs.build.outputs.debian_ref }} = cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " " - test ${{ needs.build.outputs.debian_rev }} = cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " " + echo ${{ needs.build.outputs.debian_name }} + test -v ${{ needs.build.outputs.debian_name }} + + echo ${{ needs.build.outputs.debian_ref }} + test -v ${{ needs.build.outputs.debian_ref }} + + echo ${{ needs.build.outputs.debian_rev }} + test -v ${{ needs.build.outputs.debian_rev }} From 85c515964743a523b20bf2aeeba063fc6f0a6a4f Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:58:42 +0200 Subject: [PATCH 05/32] Test --- .forgejo/workflows/pull-requests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index cca5a96..0e37da9 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -58,6 +58,7 @@ jobs: cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} + echo $GITHUB_OUTPUT DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") From 06868d14c09083ed42048df2c0e3da91c31fcb8c Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 19:59:50 +0200 Subject: [PATCH 06/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 0e37da9..8cd695e 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -57,7 +57,7 @@ jobs: 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 $GITHUB_OUTPUT DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} From 30b635ef917a6d8f84c07299a13ee428d04d8469 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:01:08 +0200 Subject: [PATCH 07/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 8cd695e..3c0c188 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -58,7 +58,7 @@ jobs: cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT - echo $GITHUB_OUTPUT + echo GITHUB_OUTPUT = $GITHUB_OUTPUT DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") From 2ddf5faaa2893af885e73603f6eec49c4d10833c Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:02:13 +0200 Subject: [PATCH 08/32] Test --- .forgejo/workflows/pull-requests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 3c0c188..27a75e4 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -55,14 +55,16 @@ jobs: - name: Bundle .deb package id: deb_bundle run: | - cargo deb + cargo deb; DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT - echo GITHUB_OUTPUT = $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 DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} + echo DEBIAN_NAME: $DEBIAN_NAME mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact From d2e7eb9dafae5de3799bc3d8f91e0f8e48253ae9 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:03:17 +0200 Subject: [PATCH 09/32] Test --- .forgejo/workflows/pull-requests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 27a75e4..b004cf9 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -55,7 +55,9 @@ jobs: - name: Bundle .deb package id: deb_bundle run: | - cargo deb; + echo test + cargo deb + echo test DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT echo DEBIAN_REF: $DEBIAN_REF From 7f5c4c6230c169844aceb4fa755c9d2fd591a814 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:04:15 +0200 Subject: [PATCH 10/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index b004cf9..76fbdb1 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -56,7 +56,7 @@ jobs: id: deb_bundle run: | echo test - cargo deb + echo test DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT From 198cc44850fd62028865a1aff03598b12ce71b18 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:04:33 +0200 Subject: [PATCH 11/32] Test --- .forgejo/workflows/pull-requests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 76fbdb1..cd07931 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -47,10 +47,10 @@ jobs: - name: Prepare build environment run: mkdir dist - - name: Compiling To Linux Target - run: | - cargo build -r - mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64 + #- 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 From 972706ac6f99eaa7b2609c7c89259c34e9905f7d Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:05:17 +0200 Subject: [PATCH 12/32] Test --- .forgejo/workflows/pull-requests.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index cd07931..9308877 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -56,18 +56,7 @@ jobs: id: deb_bundle run: | echo test - - echo test - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - 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 - DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") - echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} - echo DEBIAN_NAME: $DEBIAN_NAME - mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb + - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From e41c39ce38c6919e9144e396de23d6e02562b81e Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:06:20 +0200 Subject: [PATCH 13/32] Test --- .forgejo/workflows/pull-requests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 9308877..3769c19 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -55,8 +55,9 @@ jobs: - name: Bundle .deb package id: deb_bundle run: | - echo test - + DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) + echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT + echo DEBIAN_REF: $DEBIAN_REF - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From 25c87ae6e57346c7e6f32d200aa8973e9483ba94 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:07:09 +0200 Subject: [PATCH 14/32] Test --- .forgejo/workflows/pull-requests.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 3769c19..c509cf4 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -58,6 +58,13 @@ jobs: DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) 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 + DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} + echo DEBIAN_NAME: $DEBIAN_NAME + mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From 3ddd621bac016f0ab67e96afb9d6c80dc1939f1c Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:08:20 +0200 Subject: [PATCH 15/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index c509cf4..e27deea 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -64,7 +64,7 @@ jobs: DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_NAME: $DEBIAN_NAME - mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb + - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From ceb58b58950ae7ecd610134c4b9902fa28aa2424 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:11:48 +0200 Subject: [PATCH 16/32] Test --- .forgejo/workflows/build+release.yml | 8 ++++---- .forgejo/workflows/pull-requests.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index b3db383..f7845d6 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -111,20 +111,20 @@ jobs: - 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 \ + --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' 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 \ + --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 if: (! contains(github.ref_name, '-rc')) 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 \ + --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/main/upload' 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 \ + --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/main/upload create-release: diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index e27deea..5b4d0e2 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -47,24 +47,24 @@ jobs: - name: Prepare build environment run: mkdir dist - #- name: Compiling To Linux Target - # run: | - # cargo build -r - # mv target/release/${{ github.event.repository.name }} dist/${{ github.event.repository.name }}-linux-amd64 + - 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 run: | DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - echo "debian_ref=$DEBIAN_REF" >> $GITHUB_OUTPUT + echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_REF: $DEBIAN_REF - 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" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_REV: $DEBIAN_REV - DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_NAME: $DEBIAN_NAME - + 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 - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From a5139a7dd52d6228ab0739e2f770dd15724c416a Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:12:25 +0200 Subject: [PATCH 17/32] Test --- .forgejo/workflows/build+release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index f7845d6..cbb18db 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -74,7 +74,7 @@ jobs: echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} 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 + mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From a94eae2fc58124443cf0ebed21117b4403ab0b6d Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:13:08 +0200 Subject: [PATCH 18/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 5b4d0e2..da7a988 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -64,7 +64,7 @@ jobs: DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_NAME: $DEBIAN_NAME - 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_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From 0caba1a9d6e7e667164012197fdd203780b26a2a Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:30:27 +0200 Subject: [PATCH 19/32] Test --- .forgejo/workflows/pull-requests.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index da7a988..77f1b31 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -37,9 +37,9 @@ jobs: runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest outputs: - DEBIAN_NAME: ${{ steps.deb_bundle.outputs.debian_name }} - DEBIAN_REV: ${{ steps.deb_bundle.outputs.debian_rev }} - DEBIAN_REF: ${{ steps.deb_bundle.outputs.debian_ref }} + DEBIAN_NAME: ${{ steps.deb.outputs.debian_name }} + DEBIAN_REV: ${{ steps.deb.outputs.debian_rev }} + DEBIAN_REF: ${{ steps.deb.outputs.debian_ref }} steps: - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 @@ -52,8 +52,8 @@ jobs: 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: | DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} @@ -64,7 +64,9 @@ jobs: DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") echo "debian_name=$DEBIAN_NAME" >> ${{ env.GITHUB_OUTPUT }} echo DEBIAN_NAME: $DEBIAN_NAME - mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb + + - name: Bundle .deb package + run: mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From a95a3c11fb45edb444b2bad15152678bd0d94157 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:34:21 +0200 Subject: [PATCH 20/32] Test --- .forgejo/workflows/build+release.yml | 4 ++-- .forgejo/workflows/pull-requests.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index cbb18db..c66810a 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -70,9 +70,9 @@ jobs: cargo deb DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} - 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" >> ${{ env.GITHUB_OUTPUT }} - DEBIAN_NAME=-$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + 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 - diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 77f1b31..f6bf3c8 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -61,7 +61,7 @@ jobs: 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 - DEBIAN_NAME=$(cat Cargo.toml | grep -E "(^|\|)name =" | cut -f2- -d= | tr -d \" | tr -d " ") + 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 From 6456e0f6674b9384855a1120683a2ceb7f6c77f8 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:36:32 +0200 Subject: [PATCH 21/32] test --- .forgejo/workflows/pull-requests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index f6bf3c8..9341328 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -66,7 +66,9 @@ jobs: echo DEBIAN_NAME: $DEBIAN_NAME - name: Bundle .deb package - run: mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb + run: | + echo mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb + mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From b6a6c5c2f594328bfd567fb23b489d8079965ab5 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:38:12 +0200 Subject: [PATCH 22/32] Test --- .forgejo/workflows/pull-requests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 9341328..4769b35 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -67,8 +67,8 @@ jobs: - name: Bundle .deb package run: | - echo mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb - mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}-${{ DEBIAN_REV }}_amd64.deb + echo 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/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb dist/${{ env.DEBIAN_NAME }}_${{ env.DEBIAN_REF }}-${{ env.DEBIAN_REV }}_amd64.deb - name: Uploading Build Artifact uses: actions/upload-artifact@v3 From 4e6896f10a3a5172b1e2a639620ac04cb55cbf3c Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:42:09 +0200 Subject: [PATCH 23/32] Test --- .forgejo/workflows/pull-requests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 4769b35..74d7c38 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -67,7 +67,8 @@ jobs: - name: Bundle .deb package run: | - echo 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 + 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 - name: Uploading Build Artifact From c4d7169c63fc7825e841be2361c95cd3d858eae4 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:43:04 +0200 Subject: [PATCH 24/32] Test --- .forgejo/workflows/pull-requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index 74d7c38..4f43e39 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -67,7 +67,7 @@ jobs: - 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 + 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 From bcf92e62dba20bc51cddc841d762293b9d2a71ce Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:46:10 +0200 Subject: [PATCH 25/32] 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 From df9e58624ee606bc83c4332089429bbbd71b9064 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:49:58 +0200 Subject: [PATCH 26/32] Test --- .forgejo/workflows/build+release.yml | 2 +- .forgejo/workflows/pull-requests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 3717f74..c7af02f 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -65,7 +65,7 @@ jobs: - name: Collect Debian Metadata id: deb run: | - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) + DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) 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 " ") diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index d7f7078..a6f0a26 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -55,7 +55,7 @@ jobs: - name: Collect Debian Metadata id: deb run: | - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) + DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) 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 " ") From 81c2a115c928a21bdf576521e60788ce677cd4b0 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:51:10 +0200 Subject: [PATCH 27/32] Test --- .forgejo/workflows/build+release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index c7af02f..8d4509c 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -77,6 +77,7 @@ jobs: - name: Bundle .deb package run: | + cargo deb 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 From 56d440121a50c2d6c52cf5d6ff673158ff70eb7a Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:52:28 +0200 Subject: [PATCH 28/32] Test --- .forgejo/workflows/build+release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 8d4509c..3badf76 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -78,6 +78,7 @@ jobs: - name: Bundle .deb package run: | cargo deb + ls target/debian 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 From 7fec5ce2c7804cca8a69ef2cd5761402d9f39ef5 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:54:26 +0200 Subject: [PATCH 29/32] Test --- .forgejo/workflows/build+release.yml | 1 - .forgejo/workflows/pull-requests.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 3badf76..8d4509c 100644 --- a/.forgejo/workflows/build+release.yml +++ b/.forgejo/workflows/build+release.yml @@ -78,7 +78,6 @@ jobs: - name: Bundle .deb package run: | cargo deb - ls target/debian 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 diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index a6f0a26..c351154 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -67,6 +67,7 @@ jobs: - name: Bundle .deb package run: | + cargo deb 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 From b6fc65379907767bca304ea78064c8caa6ec7381 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 20:56:43 +0200 Subject: [PATCH 30/32] Test --- .forgejo/workflows/pull-requests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index c351154..c89675c 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -37,9 +37,9 @@ jobs: runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest outputs: - DEBIAN_NAME: ${{ steps.deb.outputs.debian_name }} - DEBIAN_REV: ${{ steps.deb.outputs.debian_rev }} - DEBIAN_REF: ${{ steps.deb.outputs.debian_ref }} + debian_name: ${{ steps.deb.outputs.debian_name }} + debian_rev: ${{ steps.deb.outputs.debian_rev }} + debian_ref: ${{ steps.deb.outputs.debian_ref }} steps: - name: Checking Out Repository Code uses: https://code.forgejo.org/actions/checkout@v3 @@ -86,11 +86,11 @@ jobs: steps: - name: Test Debian Variables run: | - echo ${{ needs.build.outputs.debian_name }} + echo DEBIAN_NAME: ${{ needs.build.outputs.debian_name }} test -v ${{ needs.build.outputs.debian_name }} - echo ${{ needs.build.outputs.debian_ref }} + echo DEBIAN_REF: ${{ needs.build.outputs.debian_ref }} test -v ${{ needs.build.outputs.debian_ref }} - echo ${{ needs.build.outputs.debian_rev }} + echo DEBIAN_REV: ${{ needs.build.outputs.debian_rev }} test -v ${{ needs.build.outputs.debian_rev }} From 94d79d522390cd3c3e65a743c9aeeb44b56ab912 Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 21:02:11 +0200 Subject: [PATCH 31/32] Test --- .forgejo/workflows/pull-requests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/pull-requests.yml b/.forgejo/workflows/pull-requests.yml index c89675c..72d7b56 100644 --- a/.forgejo/workflows/pull-requests.yml +++ b/.forgejo/workflows/pull-requests.yml @@ -87,10 +87,10 @@ jobs: - name: Test Debian Variables run: | echo DEBIAN_NAME: ${{ needs.build.outputs.debian_name }} - test -v ${{ needs.build.outputs.debian_name }} + test -n ${{ needs.build.outputs.debian_name }} echo DEBIAN_REF: ${{ needs.build.outputs.debian_ref }} - test -v ${{ needs.build.outputs.debian_ref }} + test -n ${{ needs.build.outputs.debian_ref }} echo DEBIAN_REV: ${{ needs.build.outputs.debian_rev }} - test -v ${{ needs.build.outputs.debian_rev }} + test -n ${{ needs.build.outputs.debian_rev }} From c675c7c860eeb920db2742e6705027400d9ca10e Mon Sep 17 00:00:00 2001 From: Neshura <neshura@neshweb.net> Date: Wed, 7 Aug 2024 21:07:12 +0200 Subject: [PATCH 32/32] CI Cross-Job Var Fix Attempt --- .forgejo/workflows/build+release.yml | 99 +++++++++++++++------------- .forgejo/workflows/pull-requests.yml | 75 ++++++++++++++------- .forgejo/workflows/test.yml | 15 ++--- 3 files changed, 113 insertions(+), 76 deletions(-) diff --git a/.forgejo/workflows/build+release.yml b/.forgejo/workflows/build+release.yml index 81de150..8d4509c 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 @@ -47,32 +46,43 @@ jobs: if: success() runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest + outputs: + DEBIAN_NAME: ${{ steps.deb_bundle.outputs.debian_name }} + 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: | + DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) + 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" >> $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" >> $GITHUB_OUTPUT + echo DEBIAN_NAME: $DEBIAN_NAME + + - name: Bundle .deb package run: | cargo deb - DEBIAN_REF=$(echo ${{ github.ref_name }} | tr - \~) - echo "debian_ref=$DEBIAN_REF" >> ${{ env.GITHUB_OUTPUT }} - DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") - echo "debian_rev=$DEBIAN_REV" >> ${{ env.GITHUB_OUTPUT }} - 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 + 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 @@ -84,11 +94,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 \ @@ -102,27 +111,26 @@ 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/${{ steps.deb_bundle.outputs.debian_name }}_'${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}'_amd64.deb \ + --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' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}_amd64.deb \ + --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 }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_'${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}'_amd64.deb \ + --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/main/upload' curl -v --user ${{ secrets.FORGEJO_USERNAME }}:${{ secrets.FORGEJO_TOKEN }} \ - --upload-file release_blobs/${{ steps.deb_bundle.outputs.debian_name }}_${{ steps.deb_bundle.outputs.debian_ref }}${{ steps.deb_bundle.outputs.debian_rev }}_amd64.deb \ + --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/main/upload create-release: @@ -130,11 +138,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 d8db6cd..72d7b56 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: @@ -37,29 +36,61 @@ jobs: if: success() runs-on: docker container: forgejo.neshweb.net/ci-docker-images/rust-node:latest + outputs: + debian_name: ${{ steps.deb.outputs.debian_name }} + debian_rev: ${{ steps.deb.outputs.debian_rev }} + debian_ref: ${{ steps.deb.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: Collect Debian Metadata + id: deb + run: | + DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) + 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" >> $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" >> $GITHUB_OUTPUT + echo DEBIAN_NAME: $DEBIAN_NAME + + - name: Bundle .deb package run: | cargo deb - DEBIAN_REF=$(cat Cargo.toml | grep -E "(^|\|)version =" | cut -f2- -d= | tr -d \" | tr -d " " | tr - \~) - DEBIAN_REV=-$(cat Cargo.toml | grep -E "(^|\|)revision =" | cut -f2- -d= | tr -d \" | tr -d " ") - mv target/debian/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb dist/${{ DEBIAN_NAME }}_${{ DEBIAN_REF }}${{ DEBIAN_REV }}_amd64.deb - - - name: Uploading Build Artifact + 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 path: dist - if-no-files-found: error \ No newline at end of file + if-no-files-found: error + + test-env: + needs: build + if: success() + runs-on: docker + steps: + - name: Test Debian Variables + run: | + echo DEBIAN_NAME: ${{ needs.build.outputs.debian_name }} + test -n ${{ needs.build.outputs.debian_name }} + + echo DEBIAN_REF: ${{ needs.build.outputs.debian_ref }} + test -n ${{ needs.build.outputs.debian_ref }} + + echo DEBIAN_REV: ${{ needs.build.outputs.debian_rev }} + test -n ${{ needs.build.outputs.debian_rev }} 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