From 3cb812cb0ead5513d5eab3c13dd91093bbdb30fc Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 30 Dec 2024 23:02:27 +0000 Subject: [PATCH 01/20] updated GHActions to latest versions --- .github/workflows/crankshaft.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/crankshaft.yml b/.github/workflows/crankshaft.yml index 3aef6dee..cc44de7e 100644 --- a/.github/workflows/crankshaft.yml +++ b/.github/workflows/crankshaft.yml @@ -36,13 +36,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v4 with: submodules: true - name: Set up QEMU id: qemu - uses: docker/setup-qemu-action@v1.2.0 + uses: docker/setup-qemu-action@v3 with: image: tonistiigi/binfmt:latest platforms: all @@ -137,7 +137,7 @@ jobs: - name: Upload build artifacts id: upload_deploy - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: deploy path: | @@ -167,7 +167,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Download artifact - uses: actions/download-artifact@v4.1.8 + uses: actions/download-artifact@v4 with: name: deploy - From 995cb1849820d0b7105ad1976b7e35f8b4ae88f8 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 2 Jan 2025 21:39:21 +0000 Subject: [PATCH 02/20] fix root margin --- export-image/prerun.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/export-image/prerun.sh b/export-image/prerun.sh index a5a389f4..d77659d4 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -18,7 +18,8 @@ ALIGN="$((4 * 1024 * 1024))" # some overhead (since actual space usage is usually rounded up to the # filesystem block size) and gives some free space on the resulting # image. -ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)" +#ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)" +ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2) / 1" | bc)" BOOT_PART_START=$((ALIGN)) BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN)) From 731f5acd98e26528b40ce65dda350c8d3e2377c6 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 2 Jan 2025 23:05:09 +0000 Subject: [PATCH 03/20] updated releases --- .github/workflows/pifile.yml | 8 ++++---- .github/workflows/stale.yml | 2 +- export-image/prerun.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index d1abf168..f73d460c 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Get the version id: get_version @@ -68,7 +68,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Get the version id: get_version @@ -111,7 +111,7 @@ jobs: - name: Upload build artifacts id: upload_deploy - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.get_version.outputs.version }} path: | @@ -177,7 +177,7 @@ jobs: steps: - name: Download build artifacts - uses: actions/download-artifact@v4.1.8 + uses: actions/download-artifact@v4 with: name: ${{ steps.get_version.outputs.version }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 58353e05..cd3e1151 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -21,7 +21,7 @@ jobs: stale-issue-label: 'no-issue-activity' exempt-issue-labels: 'awaiting-approval,work-in-progress,dontclose,documentation,security,pinned,future-enhancement,enhancement' close-issue-message: 'This issue was closed because it has been stalled for 60 days with no activity.' - days-before-issue-close: 0 + days-before-issue-close: 30 days-before-issue-stale: 120 exempt-all-pr-assignees: true stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 30 days.' diff --git a/export-image/prerun.sh b/export-image/prerun.sh index d77659d4..e73e9707 100755 --- a/export-image/prerun.sh +++ b/export-image/prerun.sh @@ -19,7 +19,7 @@ ALIGN="$((4 * 1024 * 1024))" # filesystem block size) and gives some free space on the resulting # image. #ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2 + 200 * 1024 * 1024) / 1" | bc)" -ROOT_MARGIN="$(echo "($ROOT_SIZE * 0.2) / 1" | bc)" +ROOT_MARGIN="$(echo "(($ROOT_SIZE * 0.2) + (512 * 1024 * 1024)) / 1" | bc)" # add 512MB to the rootfs size BOOT_PART_START=$((ALIGN)) BOOT_PART_SIZE=$(((BOOT_SIZE + ALIGN - 1) / ALIGN * ALIGN)) From 6efef3581ac7206a79d99c8884ed7eec98c22e99 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 2 Jan 2025 23:32:28 +0000 Subject: [PATCH 04/20] updated pifile build --- .github/workflows/pifile.yml | 2 +- updater/base_buster_arm7.Pifile | 41 ++++++++++++++++++++++++++++++++ updater/base_buster_armhf.Pifile | 41 ++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index f73d460c..0f7b6d27 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -85,7 +85,7 @@ jobs: osname: ${{ matrix.config.osname }} - name: Create Base Image - uses: Nature40/pimod@v0.5.0 + uses: Nature40/pimod@v0.6.1 #v0.5.0 with: pifile: ${{ matrix.config.basefile }}.Pifile - diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index be28a9a9..d9889101 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -11,6 +11,47 @@ apt-get install -y sl apt-get autoremove -y " +# update openauto and aasdk +RUN bash -c " +rm -f /usr/local/bin/autoapp +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp /usr/local/bin/autoapp +chmod 777 /usr/local/bin/autoapp +rm -f /usr/local/bin/autoapp.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 /usr/local/bin/autoapp.md5 +chmod 644 /usr/local/bin/autoapp.md5 +rm -f /usr/local/bin/autoapp_helper +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper /usr/local/bin/autoapp_helper +chmod 777 /usr/local/bin/autoapp_helper +rm -f /usr/local/bin/autoapp_helper.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 /usr/local/bin/autoapp_helper.md5 +chmod 644 /usr/local/bin/autoapp_helper.md5 +rm -f /usr/local/bin/btservice +wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice /usr/local/bin/btservice +chmod 777 /usr/local/bin/btservice +rm -f /usr/local/bin/btservice.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 /usr/local/bin/btservice.md5 +chmod 644 /usr/local/bin/btservice.md5 +rm -f /usr/local/lib/libaasdk.so +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so /usr/local/lib/libaasdk.so +chmod 666 /usr/local/lib/libaasdk.so +rm -f /usr/local/lib/libaasdk.so.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 /usr/local/lib/libaasdk.so.md5 +chmod 644 /usr/local/lib/libaasdk.so.md5 +rm -f /usr/local/lib/libaasdk_proto.so +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so /usr/local/lib/libaasdk_proto.so +chmod 666 /usr/local/lib/libaasdk_proto.so +rm -f /usr/local/lib/libaasdk_proto.so.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 /usr/local/lib/libaasdk_proto.so.md5 +chmod 644 /usr/local/lib/libaasdk_proto.so.md5 +rm -f /usr/local/bin/crankshaft +wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft /usr/local/bin/crankshaft +chmod 777 /usr/local/bin/crankshaft +rm -f /usr/local/bin/crankshaft.md5 +wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 /usr/local/bin/crankshaft.md5 +chmod 644 /usr/local/bin/crankshaft.md5 + +" + RUN bash -c " cd /root rm -rf /usr/local/qt5 diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index 8667c8b0..c2da3947 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -10,3 +10,44 @@ DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade apt-get install -y sl apt-get autoremove -y " + +# update openauto and aasdk +RUN bash -c " +rm -f /usr/local/bin/autoapp +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp /usr/local/bin/autoapp +chmod 777 /usr/local/bin/autoapp +rm -f /usr/local/bin/autoapp.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 /usr/local/bin/autoapp.md5 +chmod 644 /usr/local/bin/autoapp.md5 +rm -f /usr/local/bin/autoapp_helper +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper /usr/local/bin/autoapp_helper +chmod 777 /usr/local/bin/autoapp_helper +rm -f /usr/local/bin/autoapp_helper.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 /usr/local/bin/autoapp_helper.md5 +chmod 644 /usr/local/bin/autoapp_helper.md5 +rm -f /usr/local/bin/btservice +wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice /usr/local/bin/btservice +chmod 777 /usr/local/bin/btservice +rm -f /usr/local/bin/btservice.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 /usr/local/bin/btservice.md5 +chmod 644 /usr/local/bin/btservice.md5 +rm -f /usr/local/lib/libaasdk.so +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so /usr/local/lib/libaasdk.so +chmod 666 /usr/local/lib/libaasdk.so +rm -f /usr/local/lib/libaasdk.so.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 /usr/local/lib/libaasdk.so.md5 +chmod 644 /usr/local/lib/libaasdk.so.md5 +rm -f /usr/local/lib/libaasdk_proto.so +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so /usr/local/lib/libaasdk_proto.so +chmod 666 /usr/local/lib/libaasdk_proto.so +rm -f /usr/local/lib/libaasdk_proto.so.md5 +wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 /usr/local/lib/libaasdk_proto.so.md5 +chmod 644 /usr/local/lib/libaasdk_proto.so.md5 +rm -f /usr/local/bin/crankshaft +wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft /usr/local/bin/crankshaft +chmod 777 /usr/local/bin/crankshaft +rm -f /usr/local/bin/crankshaft.md5 +wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 /usr/local/bin/crankshaft.md5 +chmod 644 /usr/local/bin/crankshaft.md5 + +" \ No newline at end of file From fcdfb86fe24c963b2b7933dc94cf14a728e8175f Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 2 Jan 2025 23:43:25 +0000 Subject: [PATCH 05/20] updated wget cmd --- updater/base_buster_arm7.Pifile | 24 ++++++++++++------------ updater/base_buster_armhf.Pifile | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index d9889101..bda745a6 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -14,40 +14,40 @@ apt-get autoremove -y # update openauto and aasdk RUN bash -c " rm -f /usr/local/bin/autoapp -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp /usr/local/bin/autoapp +wget -O /usr/local/bin/autoapp https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp chmod 777 /usr/local/bin/autoapp rm -f /usr/local/bin/autoapp.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 /usr/local/bin/autoapp.md5 +wget -O /usr/local/bin/autoapp.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 chmod 644 /usr/local/bin/autoapp.md5 rm -f /usr/local/bin/autoapp_helper -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper /usr/local/bin/autoapp_helper +wget -O /usr/local/bin/autoapp_helper https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper chmod 777 /usr/local/bin/autoapp_helper rm -f /usr/local/bin/autoapp_helper.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 /usr/local/bin/autoapp_helper.md5 +wget -O /usr/local/bin/autoapp_helper.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 chmod 644 /usr/local/bin/autoapp_helper.md5 rm -f /usr/local/bin/btservice -wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice /usr/local/bin/btservice +wget -O /usr/local/bin/btservice https://github.com/opencardev/prebuilts/raw/master/openauto/btservice chmod 777 /usr/local/bin/btservice rm -f /usr/local/bin/btservice.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 /usr/local/bin/btservice.md5 +wget -O /usr/local/bin/btservice.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 chmod 644 /usr/local/bin/btservice.md5 rm -f /usr/local/lib/libaasdk.so -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so /usr/local/lib/libaasdk.so +wget -O /usr/local/lib/libaasdk.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so chmod 666 /usr/local/lib/libaasdk.so rm -f /usr/local/lib/libaasdk.so.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 /usr/local/lib/libaasdk.so.md5 +wget -O /usr/local/lib/libaasdk.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 chmod 644 /usr/local/lib/libaasdk.so.md5 rm -f /usr/local/lib/libaasdk_proto.so -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so /usr/local/lib/libaasdk_proto.so +wget -O /usr/local/lib/libaasdk_proto.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so chmod 666 /usr/local/lib/libaasdk_proto.so rm -f /usr/local/lib/libaasdk_proto.so.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 /usr/local/lib/libaasdk_proto.so.md5 +wget -O /usr/local/lib/libaasdk_proto.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 chmod 644 /usr/local/lib/libaasdk_proto.so.md5 rm -f /usr/local/bin/crankshaft -wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft /usr/local/bin/crankshaft +wget -O /usr/local/bin/crankshaft https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft chmod 777 /usr/local/bin/crankshaft rm -f /usr/local/bin/crankshaft.md5 -wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 /usr/local/bin/crankshaft.md5 +wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 chmod 644 /usr/local/bin/crankshaft.md5 " diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index c2da3947..2d41a1a1 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -14,40 +14,40 @@ apt-get autoremove -y # update openauto and aasdk RUN bash -c " rm -f /usr/local/bin/autoapp -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp /usr/local/bin/autoapp +wget -O /usr/local/bin/autoapp https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp chmod 777 /usr/local/bin/autoapp rm -f /usr/local/bin/autoapp.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 /usr/local/bin/autoapp.md5 +wget -O /usr/local/bin/autoapp.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp.md5 chmod 644 /usr/local/bin/autoapp.md5 rm -f /usr/local/bin/autoapp_helper -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper /usr/local/bin/autoapp_helper +wget -O /usr/local/bin/autoapp_helper https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper chmod 777 /usr/local/bin/autoapp_helper rm -f /usr/local/bin/autoapp_helper.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 /usr/local/bin/autoapp_helper.md5 +wget -O /usr/local/bin/autoapp_helper.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/autoapp_helper.md5 chmod 644 /usr/local/bin/autoapp_helper.md5 rm -f /usr/local/bin/btservice -wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice /usr/local/bin/btservice +wget -O /usr/local/bin/btservice https://github.com/opencardev/prebuilts/raw/master/openauto/btservice chmod 777 /usr/local/bin/btservice rm -f /usr/local/bin/btservice.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 /usr/local/bin/btservice.md5 +wget -O /usr/local/bin/btservice.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/btservice.md5 chmod 644 /usr/local/bin/btservice.md5 rm -f /usr/local/lib/libaasdk.so -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so /usr/local/lib/libaasdk.so +wget -O /usr/local/lib/libaasdk.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so chmod 666 /usr/local/lib/libaasdk.so rm -f /usr/local/lib/libaasdk.so.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 /usr/local/lib/libaasdk.so.md5 +wget -O /usr/local/lib/libaasdk.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk.so.md5 chmod 644 /usr/local/lib/libaasdk.so.md5 rm -f /usr/local/lib/libaasdk_proto.so -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so /usr/local/lib/libaasdk_proto.so +wget -O /usr/local/lib/libaasdk_proto.so https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so chmod 666 /usr/local/lib/libaasdk_proto.so rm -f /usr/local/lib/libaasdk_proto.so.md5 -wget https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 /usr/local/lib/libaasdk_proto.so.md5 +wget -O /usr/local/lib/libaasdk_proto.so.md5 https://github.com/opencardev/prebuilts/raw/master/openauto/libaasdk_proto.so.md5 chmod 644 /usr/local/lib/libaasdk_proto.so.md5 rm -f /usr/local/bin/crankshaft -wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft /usr/local/bin/crankshaft +wget -O /usr/local/bin/crankshaft https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft chmod 777 /usr/local/bin/crankshaft rm -f /usr/local/bin/crankshaft.md5 -wget https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 /usr/local/bin/crankshaft.md5 +wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5 chmod 644 /usr/local/bin/crankshaft.md5 " \ No newline at end of file From 539bcaf5bc5a6c59295c759dfd6ce7c0cd6d3761 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 00:00:46 +0000 Subject: [PATCH 06/20] add version fix --- .github/workflows/pifile.yml | 16 +++++++++------- updater/base_buster_arm7.Pifile | 13 +------------ updater/base_buster_armhf.Pifile | 2 +- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 0f7b6d27..ba0fd938 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -39,6 +39,8 @@ jobs: env: version: ${{ github.event.inputs.version }} build: + outputs: + version: ${{ steps.get_version.outputs.version }} runs-on: ${{ matrix.host }} needs: [ version ] strategy: @@ -90,13 +92,13 @@ jobs: pifile: ${{ matrix.config.basefile }}.Pifile - name: Rename Image - run: mv ${{ matrix.config.basefile }}.img crankshaft-${{needs.version.outputs.buildname }}.img + run: mv ${{ matrix.config.basefile }}.img ${{steps.get_version.outputs.version}}.img - name: Package zip id: packagezip run: | - IMG_FILENAME="crankshaft-${{needs.version.outputs.buildname }}.img" - ZIP_FILENAME="crankshaft-${{needs.version.outputs.buildname }}.zip" + IMG_FILENAME="${{steps.get_version.outputs.version}}.img" + ZIP_FILENAME="${{steps.get_version.outputs.version}}.zip" MD5HASH="${IMG_FILENAME}.md5" SHA1HASH="${IMG_FILENAME}.sha1" SHA256HASH="${IMG_FILENAME}.sha256" @@ -179,19 +181,19 @@ jobs: name: Download build artifacts uses: actions/download-artifact@v4 with: - name: ${{ steps.get_version.outputs.version }} + name: ${{ needs.build.get_version.outputs.version }} - name: Get Artifact Filenames id: getfilenames run: | - IMG_FILENAME="crankshaft-${{needs.version.outputs.buildname }}.img" - ZIP_FILENAME="crankshaft-${{needs.version.outputs.buildname }}.zip" + IMG_FILENAME="${{needs.build.outputs.version }}.img" + ZIP_FILENAME="${{needs.build.outputs.version }}.zip" MD5HASH="${IMG_FILENAME}.md5" SHA1HASH="${IMG_FILENAME}.sha1" SHA256HASH="${IMG_FILENAME}.sha256" zip "${ZIP_FILENAME}" "${IMG_FILENAME}" "${MD5HASH}" "${SHA1HASH}" "${SHA256HASH}" - echo ::set-output name=ZIP_FILENAME::"${ZIP_FILENAME}" + echo "{ZIP_FILENAME}=${ZIP_FILENAME}" echo ::set-output name=MD5HASH::"${MD5HASH}" echo ::set-output name=SHA1HASH::"${SHA1HASH}" echo ::set-output name=SHA256HASH::"${SHA256HASH}" diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index bda745a6..27bd991a 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -1,5 +1,5 @@ #FROM https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip -FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.4/2021-09-22-crankshaft-ng-ea9e288.zip +FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.5/2022-02-04-crankshaft-ng-496df4a-pi2.zip PUMP 1000M # Update OS and sources @@ -51,14 +51,3 @@ wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/ra chmod 644 /usr/local/bin/crankshaft.md5 " - -RUN bash -c " -cd /root -rm -rf /usr/local/qt5 -wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part00 -wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part01 -wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part02 -wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part03 -cat Qt_5151_armv7l_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz -tar -xf Qt5_OpenGLES2.tar.xz -C / -" diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index 2d41a1a1..9dd9eb2b 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -1,5 +1,5 @@ #FROM https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip -FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.4/2021-09-22-crankshaft-ng-ea9e288.zip +FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.5/2022-02-04-crankshaft-ng-496df4a.zip PUMP 1000M # Update OS and sources From adb2771099e1c05f37faa95a1b53935c94c10a6b Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 00:03:24 +0000 Subject: [PATCH 07/20] base update --- updater/base_buster_arm7.Pifile | 2 +- updater/base_buster_armhf.Pifile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile index 27bd991a..9805436d 100644 --- a/updater/base_buster_arm7.Pifile +++ b/updater/base_buster_arm7.Pifile @@ -1,5 +1,5 @@ #FROM https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip -FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.5/2022-02-04-crankshaft-ng-496df4a-pi2.zip +FROM https://github.com/opencardev/crankshaft/releases/download/v.2022.09.12.1/2022-09-11-crankshaft-ng-66525ef.zip PUMP 1000M # Update OS and sources diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile index 9dd9eb2b..acf93310 100644 --- a/updater/base_buster_armhf.Pifile +++ b/updater/base_buster_armhf.Pifile @@ -1,5 +1,5 @@ #FROM https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip -FROM https://github.com/opencardev/crankshaft/releases/download/csng-alpha7.5/2022-02-04-crankshaft-ng-496df4a.zip +FROM https://github.com/opencardev/crankshaft/releases/download/v.2022.09.12.1/2022-09-11-crankshaft-ng-66525ef-pi2.zip PUMP 1000M # Update OS and sources From 352114d0d37cd91eb88cffbbc00089b3cdbc12af Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 21:52:16 +0000 Subject: [PATCH 08/20] updated output syntax --- .github/workflows/pifile.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index ba0fd938..82b57062 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -23,19 +23,19 @@ jobs: if [ -z "$version" ] then version=$(date '+%Y%m%d') - echo ::set-output name=version::"${version}" + echo "{version}=${version}" >> $GITHUB_OUTPUT else - echo ::set-output name=version::"${version}" + echo "{version}=${version}" >> $GITHUB_OUTPUT fi builddate=$(date '+%Y-%m-%d') buildbranch='crankshaft-ng' buildhash=$(git rev-parse --short "$GITHUB_SHA") buildname="${builddate}-${buildbranch}-${buildhash}" - echo ::set-output name=version::${version} - echo ::set-output name=buildhash::${buildhash} - echo ::set-output name=buildbranch::${buildbranch} - echo ::set-output name=builddate::${builddate} - echo ::set-output name=buildname::${buildname} + echo "{version}=${version}" >> $GITHUB_OUTPUT + echo "{buildhash}=${buildhash}" >> $GITHUB_OUTPUT + echo "{buildbranch}=${buildbranch}" >> $GITHUB_OUTPUT + echo "{builddate}=${builddate}" >> $GITHUB_OUTPUT + echo "{buildname}=${buildname}" >> $GITHUB_OUTPUT env: version: ${{ github.event.inputs.version }} build: @@ -79,7 +79,7 @@ jobs: then osname=${ostype}_${osname} fi - echo ::set-output name=version::"${version}-${osname}-${arch}" + echo "{version}=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT env: version: ${{needs.version.outputs.version }} arch: ${{ matrix.config.arch }} @@ -106,10 +106,10 @@ jobs: sha1sum "${IMG_FILENAME}" > "${SHA1HASH}" sha256sum "${IMG_FILENAME}" > "${SHA256HASH}" zip "${ZIP_FILENAME}" "${IMG_FILENAME}" "${MD5HASH}" "${SHA1HASH}" "${SHA256HASH}" - echo ::set-output name=ZIP_FILENAME::"${ZIP_FILENAME}" - echo ::set-output name=MD5HASH::"${MD5HASH}" - echo ::set-output name=SHA1HASH::"${SHA1HASH}" - echo ::set-output name=SHA256HASH::"${SHA256HASH}" + echo "{ZIP_FILENAME}=${ZIP_FILENAME}" >> $GITHUB_OUTPUT + echo "{MD5HASH}=${MD5HASH}" >> $GITHUB_OUTPUT + echo "{SHA1HASH}=${SHA1HASH}" >> $GITHUB_OUTPUT + echo "{SHA256HASH}=${SHA256HASH}" >> $GITHUB_OUTPUT - name: Upload build artifacts id: upload_deploy @@ -192,11 +192,11 @@ jobs: MD5HASH="${IMG_FILENAME}.md5" SHA1HASH="${IMG_FILENAME}.sha1" SHA256HASH="${IMG_FILENAME}.sha256" - zip "${ZIP_FILENAME}" "${IMG_FILENAME}" "${MD5HASH}" "${SHA1HASH}" "${SHA256HASH}" - echo "{ZIP_FILENAME}=${ZIP_FILENAME}" - echo ::set-output name=MD5HASH::"${MD5HASH}" - echo ::set-output name=SHA1HASH::"${SHA1HASH}" - echo ::set-output name=SHA256HASH::"${SHA256HASH}" + echo "{IMG_FILENAME}=${IMG_FILENAME}" >> $GITHUB_OUTPUT + echo "{ZIP_FILENAME}=${ZIP_FILENAME}" >> $GITHUB_OUTPUT + echo "{MD5HASH}=${MD5HASH}" >> $GITHUB_OUTPUT + echo "{SHA1HASH}=${SHA1HASH}" >> $GITHUB_OUTPUT + echo "{SHA256HASH}=${SHA256HASH}" >> $GITHUB_OUTPUT - name: Upload zip to release id: upload_zip From bdd63b8bf84dc377f7d3d1c32e44d631178247d9 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 22:00:04 +0000 Subject: [PATCH 09/20] syntax fix --- .github/workflows/pifile.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 82b57062..fc83e528 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -23,19 +23,19 @@ jobs: if [ -z "$version" ] then version=$(date '+%Y%m%d') - echo "{version}=${version}" >> $GITHUB_OUTPUT + echo "version=${version}" >> $GITHUB_OUTPUT else - echo "{version}=${version}" >> $GITHUB_OUTPUT + echo "version=${version}" >> $GITHUB_OUTPUT fi builddate=$(date '+%Y-%m-%d') buildbranch='crankshaft-ng' buildhash=$(git rev-parse --short "$GITHUB_SHA") buildname="${builddate}-${buildbranch}-${buildhash}" - echo "{version}=${version}" >> $GITHUB_OUTPUT - echo "{buildhash}=${buildhash}" >> $GITHUB_OUTPUT - echo "{buildbranch}=${buildbranch}" >> $GITHUB_OUTPUT - echo "{builddate}=${builddate}" >> $GITHUB_OUTPUT - echo "{buildname}=${buildname}" >> $GITHUB_OUTPUT + echo "version=${version}" >> $GITHUB_OUTPUT + echo "buildhash=${buildhash}" >> $GITHUB_OUTPUT + echo "buildbranch=${buildbranch}" >> $GITHUB_OUTPUT + echo "builddate=${builddate}" >> $GITHUB_OUTPUT + echo "buildname=${buildname}" >> $GITHUB_OUTPUT env: version: ${{ github.event.inputs.version }} build: @@ -79,7 +79,7 @@ jobs: then osname=${ostype}_${osname} fi - echo "{version}=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT + echo "version=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT env: version: ${{needs.version.outputs.version }} arch: ${{ matrix.config.arch }} @@ -106,10 +106,10 @@ jobs: sha1sum "${IMG_FILENAME}" > "${SHA1HASH}" sha256sum "${IMG_FILENAME}" > "${SHA256HASH}" zip "${ZIP_FILENAME}" "${IMG_FILENAME}" "${MD5HASH}" "${SHA1HASH}" "${SHA256HASH}" - echo "{ZIP_FILENAME}=${ZIP_FILENAME}" >> $GITHUB_OUTPUT - echo "{MD5HASH}=${MD5HASH}" >> $GITHUB_OUTPUT - echo "{SHA1HASH}=${SHA1HASH}" >> $GITHUB_OUTPUT - echo "{SHA256HASH}=${SHA256HASH}" >> $GITHUB_OUTPUT + echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_OUTPUT + echo "MD5HASH=${MD5HASH}" >> $GITHUB_OUTPUT + echo "SHA1HASH=${SHA1HASH}" >> $GITHUB_OUTPUT + echo "SHA256HASH=${SHA256HASH}" >> $GITHUB_OUTPUT - name: Upload build artifacts id: upload_deploy @@ -192,11 +192,11 @@ jobs: MD5HASH="${IMG_FILENAME}.md5" SHA1HASH="${IMG_FILENAME}.sha1" SHA256HASH="${IMG_FILENAME}.sha256" - echo "{IMG_FILENAME}=${IMG_FILENAME}" >> $GITHUB_OUTPUT - echo "{ZIP_FILENAME}=${ZIP_FILENAME}" >> $GITHUB_OUTPUT - echo "{MD5HASH}=${MD5HASH}" >> $GITHUB_OUTPUT - echo "{SHA1HASH}=${SHA1HASH}" >> $GITHUB_OUTPUT - echo "{SHA256HASH}=${SHA256HASH}" >> $GITHUB_OUTPUT + echo "IMG_FILENAME=${IMG_FILENAME}" >> $GITHUB_OUTPUT + echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_OUTPUT + echo "MD5HASH=${MD5HASH}" >> $GITHUB_OUTPUT + echo "SHA1HASH=${SHA1HASH}" >> $GITHUB_OUTPUT + echo "SHA256HASH=${SHA256HASH}" >> $GITHUB_OUTPUT - name: Upload zip to release id: upload_zip From d1993714c08ad2640910e3206406f54280fbadd9 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 22:11:11 +0000 Subject: [PATCH 10/20] test release syntax --- .github/workflows/pifile.yml | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index fc83e528..bbdaa057 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -150,32 +150,8 @@ jobs: # Upload release artifacts upload: needs: [ version, build, release ] - runs-on: ${{ matrix.host }} - strategy: - fail-fast: false - max-parallel: 3 - matrix: - host: [ - "ubuntu-latest", - #"macos-10.15", - ] - config: - - { - name: "Debian Buster armhf", - basefile: "base_buster_armhf", - arch: "armhf", - osname: "buster", - ostype: "Debian" - } - - { - name: "Debian Buster arm7", - basefile: "updater/base_buster_arm7", - arch: "arm7", - osname: "buster", - ostype: "Debian" - } - - name: 'Upload release: ${{ matrix.config.name }}' + runs-on: "ubuntu-latest" + name: 'Upload release' steps: - name: Download build artifacts @@ -187,6 +163,7 @@ jobs: name: Get Artifact Filenames id: getfilenames run: | + ls -hla deploy/* IMG_FILENAME="${{needs.build.outputs.version }}.img" ZIP_FILENAME="${{needs.build.outputs.version }}.zip" MD5HASH="${IMG_FILENAME}.md5" From 2f28c38cf39f0af46c525c548347ed6ba3e9d839 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 22:25:53 +0000 Subject: [PATCH 11/20] switch releaser --- .github/workflows/pifile.yml | 138 +++++++++++++++++------------------ 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index bbdaa057..339ef483 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -150,75 +150,75 @@ jobs: # Upload release artifacts upload: needs: [ version, build, release ] - runs-on: "ubuntu-latest" - name: 'Upload release' + runs-on: ${{ matrix.host }} + needs: [ version ] + strategy: + fail-fast: false + max-parallel: 3 + matrix: + host: [ + "ubuntu-latest", + #"macos-10.15", + ] + config: + - { + name: "Debian Buster armhf", + basefile: "updater/base_buster_armhf", + arch: "armhf", + osname: "buster", + ostype: "Debian" + } + - { + name: "Debian Buster arm7", + basefile: "updater/base_buster_arm7", + arch: "arm7", + osname: "buster", + ostype: "Debian" + } steps: - - - name: Download build artifacts - uses: actions/download-artifact@v4 - with: - name: ${{ needs.build.get_version.outputs.version }} - - - - name: Get Artifact Filenames - id: getfilenames + - + name: Get the version + id: get_version run: | - ls -hla deploy/* - IMG_FILENAME="${{needs.build.outputs.version }}.img" - ZIP_FILENAME="${{needs.build.outputs.version }}.zip" - MD5HASH="${IMG_FILENAME}.md5" - SHA1HASH="${IMG_FILENAME}.sha1" - SHA256HASH="${IMG_FILENAME}.sha256" - echo "IMG_FILENAME=${IMG_FILENAME}" >> $GITHUB_OUTPUT - echo "ZIP_FILENAME=${ZIP_FILENAME}" >> $GITHUB_OUTPUT - echo "MD5HASH=${MD5HASH}" >> $GITHUB_OUTPUT - echo "SHA1HASH=${SHA1HASH}" >> $GITHUB_OUTPUT - echo "SHA256HASH=${SHA256HASH}" >> $GITHUB_OUTPUT - - - name: Upload zip to release - id: upload_zip - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_VERSION: ${{ needs.version.outputs.buildname }} - with: - upload_url: ${{needs.release.outputs.release_upload_url}} - asset_path: ${{ steps.getfilenames.outputs.ZIP_FILENAME }} - asset_name: ${{ steps.getfilenames.outputs.ZIP_FILENAME }} - asset_content_type: application/zip - - - name: Upload md5 to release - id: upload_md5 - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_VERSION: ${{ needs.version.outputs.buildname }} - with: - upload_url: ${{needs.release.outputs.release_upload_url}} - asset_path: ${{ steps.getfilenames.outputs.MD5HASH }} - asset_name: ${{ steps.getfilenames.outputs.MD5HASH }} - asset_content_type: text/plain - - - name: Upload sha1 to release - id: upload_sha1 - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_VERSION: ${{ needs.version.outputs.buildname }} - with: - upload_url: ${{needs.release.outputs.release_upload_url}} - asset_path: ${{ steps.getfilenames.outputs.SHA1HASH }} - asset_name: ${{ steps.getfilenames.outputs.SHA1HASH }} - asset_content_type: text/plain - - - name: Upload sha256 to release - id: upload_sha256 - uses: actions/upload-release-asset@v1.0.2 + if [ -n "$ostype" ] + then + osname=${ostype}_${osname} + fi + echo "version=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_VERSION: ${{ needs.version.outputs.buildname }} - with: - upload_url: ${{needs.release.outputs.release_upload_url}} - asset_path: ${{ steps.getfilenames.outputs.SHA256HASH }} - asset_name: ${{ steps.getfilenames.outputs.SHA256HASH }} - asset_content_type: text/plain + version: ${{needs.version.outputs.version }} + arch: ${{ matrix.config.arch }} + ostype: ${{ matrix.config.ostype }} + osname: ${{ matrix.config.osname }} + - name: Upload binaries to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: target/release/${{ steps.get_version.outputs.version }}.img + asset_name: ${{ steps.get_version.outputs.version }}.img + tag: ${{ github.ref }} + release_name: ${{needs.version.outputs.version }} + - name: Upload MD5 to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: target/release/${{ steps.get_version.outputs.version }}.img.md5 + asset_name: ${{ steps.get_version.outputs.version }}.img.md5 + tag: ${{ github.ref }} + release_name: ${{needs.version.outputs.version }} + - name: Upload SHA1 to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: target/release/${{ steps.get_version.outputs.version }}.img.sha1 + asset_name: ${{ steps.get_version.outputs.version }}.img.sha1 + tag: ${{ github.ref }} + release_name: ${{needs.version.outputs.version }} + - name: Upload SHA256 to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: target/release/${{ steps.get_version.outputs.version }}.img.sha256 + asset_name: ${{ steps.get_version.outputs.version }}.img.sha256 + tag: ${{ github.ref }} + release_name: ${{needs.version.outputs.version }} \ No newline at end of file From fb5be3a7aa7633618cdec125fd90e8f50ec28c2f Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 3 Jan 2025 22:29:06 +0000 Subject: [PATCH 12/20] remove release --- .github/workflows/pifile.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 339ef483..efbbb24c 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -135,23 +135,22 @@ jobs: uses: mikepenz/release-changelog-builder-action@v5.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Create GitHub release - id: create_release - uses: actions/create-release@v1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{needs.version.outputs.version }} - release_name: ${{needs.version.outputs.buildname }} - #body: ${{steps.github_release.outputs.changelog}} - draft: true - prerelease: true +# - +# name: Create GitHub release +# id: create_release +# uses: actions/create-release@v1.0.0 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# tag_name: ${{needs.version.outputs.version }} +# release_name: ${{needs.version.outputs.buildname }} +# #body: ${{steps.github_release.outputs.changelog}} +# draft: true +# prerelease: true # Upload release artifacts upload: needs: [ version, build, release ] runs-on: ${{ matrix.host }} - needs: [ version ] strategy: fail-fast: false max-parallel: 3 @@ -197,7 +196,7 @@ jobs: file: target/release/${{ steps.get_version.outputs.version }}.img asset_name: ${{ steps.get_version.outputs.version }}.img tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.version }} + release_name: ${{needs.version.outputs.buildname }} - name: Upload MD5 to release uses: svenstaro/upload-release-action@v2 with: @@ -205,7 +204,7 @@ jobs: file: target/release/${{ steps.get_version.outputs.version }}.img.md5 asset_name: ${{ steps.get_version.outputs.version }}.img.md5 tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.version }} + release_name: ${{needs.version.outputs.buildname }} - name: Upload SHA1 to release uses: svenstaro/upload-release-action@v2 with: @@ -213,7 +212,7 @@ jobs: file: target/release/${{ steps.get_version.outputs.version }}.img.sha1 asset_name: ${{ steps.get_version.outputs.version }}.img.sha1 tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.version }} + release_name: ${{needs.version.outputs.buildname }} - name: Upload SHA256 to release uses: svenstaro/upload-release-action@v2 with: @@ -221,4 +220,4 @@ jobs: file: target/release/${{ steps.get_version.outputs.version }}.img.sha256 asset_name: ${{ steps.get_version.outputs.version }}.img.sha256 tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.version }} \ No newline at end of file + release_name: ${{needs.version.outputs.buildname }} \ No newline at end of file From 03376a70c9e661bed66e0d078629453d185d1884 Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 22:50:08 +0000 Subject: [PATCH 13/20] path fix --- .github/workflows/pifile.yml | 56 +++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index efbbb24c..5f2c10d1 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -193,31 +193,35 @@ jobs: uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/release/${{ steps.get_version.outputs.version }}.img - asset_name: ${{ steps.get_version.outputs.version }}.img + file: target/release/${{ steps.get_version.outputs.version }}.zip + asset_name: ${{ steps.get_version.outputs.version }}.zip tag: ${{ github.ref }} release_name: ${{needs.version.outputs.buildname }} - - name: Upload MD5 to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/release/${{ steps.get_version.outputs.version }}.img.md5 - asset_name: ${{ steps.get_version.outputs.version }}.img.md5 - tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.buildname }} - - name: Upload SHA1 to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/release/${{ steps.get_version.outputs.version }}.img.sha1 - asset_name: ${{ steps.get_version.outputs.version }}.img.sha1 - tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.buildname }} - - name: Upload SHA256 to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/release/${{ steps.get_version.outputs.version }}.img.sha256 - asset_name: ${{ steps.get_version.outputs.version }}.img.sha256 - tag: ${{ github.ref }} - release_name: ${{needs.version.outputs.buildname }} \ No newline at end of file + draft: true +# - name: Upload MD5 to release +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: target/release/${{ steps.get_version.outputs.version }}.img.md5 +# asset_name: ${{ steps.get_version.outputs.version }}.img.md5 +# tag: ${{ github.ref }} +# release_name: ${{needs.version.outputs.buildname }} +# draft: true +# - name: Upload SHA1 to release +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: target/release/${{ steps.get_version.outputs.version }}.img.sha1 +# asset_name: ${{ steps.get_version.outputs.version }}.img.sha1 +# tag: ${{ github.ref }} +# release_name: ${{needs.version.outputs.buildname }} +# draft: true +# - name: Upload SHA256 to release +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: target/release/${{ steps.get_version.outputs.version }}.img.sha256 +# asset_name: ${{ steps.get_version.outputs.version }}.img.sha256 +# tag: ${{ github.ref }} +# release_name: ${{needs.version.outputs.buildname }} +# draft: true \ No newline at end of file From ed74a77fdfae5f633c0d8e58b87d0d48f4dafe2c Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 22:57:50 +0000 Subject: [PATCH 14/20] fix version --- .github/workflows/pifile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 5f2c10d1..8b0c315d 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -195,7 +195,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: target/release/${{ steps.get_version.outputs.version }}.zip asset_name: ${{ steps.get_version.outputs.version }}.zip - tag: ${{ github.ref }} + tag: ${{ steps.get_version.outputs.version }} release_name: ${{needs.version.outputs.buildname }} draft: true # - name: Upload MD5 to release From 22d1d16a0708dc4c8396d068fead1474f42a586b Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:08:26 +0000 Subject: [PATCH 15/20] asset path --- .github/workflows/pifile.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 8b0c315d..5ff100a9 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -189,15 +189,21 @@ jobs: arch: ${{ matrix.config.arch }} ostype: ${{ matrix.config.ostype }} osname: ${{ matrix.config.osname }} + - + name: Download artifact + uses: actions/download-artifact@v4 + with: + name: ${{ steps.get_version.outputs.version }} - name: Upload binaries to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: target/release/${{ steps.get_version.outputs.version }}.zip + file: ${{ steps.get_version.outputs.version }}/${{ steps.get_version.outputs.version }}.zip asset_name: ${{ steps.get_version.outputs.version }}.zip tag: ${{ steps.get_version.outputs.version }} release_name: ${{needs.version.outputs.buildname }} draft: true + file_glob: true # - name: Upload MD5 to release # uses: svenstaro/upload-release-action@v2 # with: From 41bd1cfff351b2dbd040af27d56b5d2347727239 Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:17:07 +0000 Subject: [PATCH 16/20] remove glob --- .github/workflows/pifile.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 5ff100a9..07e65251 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -203,7 +203,6 @@ jobs: tag: ${{ steps.get_version.outputs.version }} release_name: ${{needs.version.outputs.buildname }} draft: true - file_glob: true # - name: Upload MD5 to release # uses: svenstaro/upload-release-action@v2 # with: From fff4e9ea0bd5fc5ff2f915b33c284c0772ce2a5c Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:26:02 +0000 Subject: [PATCH 17/20] reorder ci --- .github/workflows/pifile.yml | 145 +++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 68 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 07e65251..ace6acbb 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -121,20 +121,29 @@ jobs: ${{ steps.packagezip.outputs.MD5HASH }} ${{ steps.packagezip.outputs.SHA1HASH }} ${{ steps.packagezip.outputs.SHA256HASH }} + - name: Upload binaries to release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ steps.packagezip.outputs.ZIP_FILENAME }} + asset_name: ${{ steps.packagezip.outputs.ZIP_FILENAME }} + tag: ${{ steps.get_version.outputs.version }} + release_name: ${{needs.version.outputs.buildname }} + draft: true # Create Release - release: - runs-on: ubuntu-latest - needs: [ version, build ] - name: 'Create release' - outputs: - release_upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - steps: - - - name: Build Changelog - id: github_release - uses: mikepenz/release-changelog-builder-action@v5.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# release: +# runs-on: ubuntu-latest +# needs: [ version, build ] +# name: 'Create release' +# outputs: +# release_upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps +# steps: +# - +# name: Build Changelog +# id: github_release +# uses: mikepenz/release-changelog-builder-action@v5.0.0 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # - # name: Create GitHub release # id: create_release @@ -148,61 +157,61 @@ jobs: # draft: true # prerelease: true # Upload release artifacts - upload: - needs: [ version, build, release ] - runs-on: ${{ matrix.host }} - strategy: - fail-fast: false - max-parallel: 3 - matrix: - host: [ - "ubuntu-latest", - #"macos-10.15", - ] - config: - - { - name: "Debian Buster armhf", - basefile: "updater/base_buster_armhf", - arch: "armhf", - osname: "buster", - ostype: "Debian" - } - - { - name: "Debian Buster arm7", - basefile: "updater/base_buster_arm7", - arch: "arm7", - osname: "buster", - ostype: "Debian" - } - steps: - - - name: Get the version - id: get_version - run: | - if [ -n "$ostype" ] - then - osname=${ostype}_${osname} - fi - echo "version=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT - env: - version: ${{needs.version.outputs.version }} - arch: ${{ matrix.config.arch }} - ostype: ${{ matrix.config.ostype }} - osname: ${{ matrix.config.osname }} - - - name: Download artifact - uses: actions/download-artifact@v4 - with: - name: ${{ steps.get_version.outputs.version }} - - name: Upload binaries to release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ steps.get_version.outputs.version }}/${{ steps.get_version.outputs.version }}.zip - asset_name: ${{ steps.get_version.outputs.version }}.zip - tag: ${{ steps.get_version.outputs.version }} - release_name: ${{needs.version.outputs.buildname }} - draft: true +# upload: +# needs: [ version, build, release ] +# runs-on: ${{ matrix.host }} +# strategy: +# fail-fast: false +# max-parallel: 3 +# matrix: +# host: [ +# "ubuntu-latest", +# #"macos-10.15", +# ] +# config: +# - { +# name: "Debian Buster armhf", +# basefile: "updater/base_buster_armhf", +# arch: "armhf", +# osname: "buster", +# ostype: "Debian" +# } +# - { +# name: "Debian Buster arm7", +# basefile: "updater/base_buster_arm7", +# arch: "arm7", +# osname: "buster", +# ostype: "Debian" +# } +# steps: +# - +# name: Get the version +# id: get_version +# run: | +# if [ -n "$ostype" ] +# then +# osname=${ostype}_${osname} +# fi +# echo "version=${version}-${osname}-${arch}" >> $GITHUB_OUTPUT +# env: +# version: ${{needs.version.outputs.version }} +# arch: ${{ matrix.config.arch }} +# ostype: ${{ matrix.config.ostype }} +# osname: ${{ matrix.config.osname }} +# - +# name: Download artifact +# uses: actions/download-artifact@v4 +# with: +# name: ${{ steps.get_version.outputs.version }} +# - name: Upload binaries to release +# uses: svenstaro/upload-release-action@v2 +# with: +# repo_token: ${{ secrets.GITHUB_TOKEN }} +# file: ${{ steps.get_version.outputs.version }}/${{ steps.get_version.outputs.version }}.zip +# asset_name: ${{ steps.get_version.outputs.version }}.zip +# tag: ${{ steps.get_version.outputs.version }} +# release_name: ${{needs.version.outputs.buildname }} +# draft: true # - name: Upload MD5 to release # uses: svenstaro/upload-release-action@v2 # with: From d1ddb25d35063229f42edc2de8ba36576b3657b8 Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:32:38 +0000 Subject: [PATCH 18/20] fix naming --- .github/workflows/pifile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index ace6acbb..5b2779b5 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -127,7 +127,7 @@ jobs: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.packagezip.outputs.ZIP_FILENAME }} asset_name: ${{ steps.packagezip.outputs.ZIP_FILENAME }} - tag: ${{ steps.get_version.outputs.version }} + tag: ${{needs.version.outputs.buildname }} release_name: ${{needs.version.outputs.buildname }} draft: true # Create Release From 473daf2a7705c2ac4e1377b5c72a9bf5f4aee612 Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:41:59 +0000 Subject: [PATCH 19/20] reordering and fix duplication --- .github/workflows/pifile.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 5b2779b5..777d134d 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -121,15 +121,21 @@ jobs: ${{ steps.packagezip.outputs.MD5HASH }} ${{ steps.packagezip.outputs.SHA1HASH }} ${{ steps.packagezip.outputs.SHA256HASH }} + - + name: Build Changelog + id: github_release + uses: mikepenz/release-changelog-builder-action@v5.0.0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload binaries to release uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.packagezip.outputs.ZIP_FILENAME }} asset_name: ${{ steps.packagezip.outputs.ZIP_FILENAME }} - tag: ${{needs.version.outputs.buildname }} - release_name: ${{needs.version.outputs.buildname }} + tag: ${{needs.version.outputs.version }} draft: true + body: ${{steps.github_release.outputs.changelog}} # Create Release # release: # runs-on: ubuntu-latest From db15556d83b47545b4a7e169407671d8a80d15ac Mon Sep 17 00:00:00 2001 From: matt Date: Sat, 4 Jan 2025 23:49:35 +0000 Subject: [PATCH 20/20] release fixing --- .github/workflows/pifile.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 777d134d..7cae7e72 100644 --- a/.github/workflows/pifile.yml +++ b/.github/workflows/pifile.yml @@ -134,8 +134,10 @@ jobs: file: ${{ steps.packagezip.outputs.ZIP_FILENAME }} asset_name: ${{ steps.packagezip.outputs.ZIP_FILENAME }} tag: ${{needs.version.outputs.version }} - draft: true - body: ${{steps.github_release.outputs.changelog}} + latest: false + prerelease: true + #draft: true + #body: ${{steps.github_release.outputs.changelog}} # Create Release # release: # runs-on: ubuntu-latest