From be2fd07d4f1be94a43608778cc24d664734480fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= Date: Mon, 28 Oct 2024 16:18:02 +0100 Subject: [PATCH 1/3] Add "Run on InfiniEmu" to pull requests, update actions/upload-artifact --- .github/workflows/main.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2eb8a95990..7848ea157d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,6 +22,8 @@ jobs: text_size: ${{ steps.output-sizes.outputs.text_size }} data_size: ${{ steps.output-sizes.outputs.data_size }} bss_size: ${{ steps.output-sizes.outputs.bss_size }} + firmware_artifact: ${{ steps.upload-firmware.outputs.artifact-id }} + resources_artifact: ${{ steps.upload-resources.outputs.artifact-id }} env: # InfiniTime sources are downloaded to the current directory. # Override SOURCES_DIR in build.sh @@ -47,22 +49,24 @@ jobs: - name: Unzip DFU package run: unzip ./build/output/pinetime-mcuboot-app-dfu-*.zip -d ./build/output/pinetime-mcuboot-app-dfu - name: Upload DFU artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: InfiniTime DFU ${{ github.head_ref }} path: ./build/output/pinetime-mcuboot-app-dfu/* - name: Upload MCUBoot image artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: InfiniTime MCUBoot image ${{ github.head_ref }} path: ./build/output/pinetime-mcuboot-app-image-*.bin - name: Upload standalone ELF artifacts - uses: actions/upload-artifact@v3 + id: upload-firmware + uses: actions/upload-artifact@v4 with: name: InfiniTime image ${{ github.head_ref }} path: ./build/output/src/pinetime-app-*.out - name: Upload resources artifacts - uses: actions/upload-artifact@v3 + id: upload-resources + uses: actions/upload-artifact@v4 with: name: InfiniTime resources ${{ github.head_ref }} path: ./build/output/infinitime-resources-*.zip @@ -103,7 +107,7 @@ jobs: cmake --build build_lv_sim - name: Upload simulator executable - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: infinisim-${{ github.head_ref }} path: build_lv_sim/infinisim @@ -200,10 +204,12 @@ jobs: | text | ${{ needs.build-firmware.outputs.text_size }}B | ${{ steps.output-sizes-diff.outputs.text_diff }}B | | data | ${{ needs.build-firmware.outputs.data_size }}B | ${{ steps.output-sizes-diff.outputs.data_diff }}B | | bss | ${{ needs.build-firmware.outputs.bss_size }}B | ${{ steps.output-sizes-diff.outputs.bss_diff }}B | + + [Run on InfiniEmu](https://infiniemu.pipe01.net/?firmware=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.firmware_artifact }}.zip&resources=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.resources_artifact }}.zip) EOF - name: Upload comment - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: comment path: comment From dff0fe564b292adfc20bae56683160505605ac71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= Date: Mon, 28 Oct 2024 23:07:58 +0100 Subject: [PATCH 2/3] Say "in" instead of "on" --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7848ea157d..1439eb9125 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,7 +205,7 @@ jobs: | data | ${{ needs.build-firmware.outputs.data_size }}B | ${{ steps.output-sizes-diff.outputs.data_diff }}B | | bss | ${{ needs.build-firmware.outputs.bss_size }}B | ${{ steps.output-sizes-diff.outputs.bss_diff }}B | - [Run on InfiniEmu](https://infiniemu.pipe01.net/?firmware=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.firmware_artifact }}.zip&resources=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.resources_artifact }}.zip) + [Run in InfiniEmu](https://infiniemu.pipe01.net/?firmware=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.firmware_artifact }}.zip&resources=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.resources_artifact }}.zip) EOF - name: Upload comment From 9b9aba3a0d837574d589d8a5209c1a80a47e3a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= Date: Wed, 30 Oct 2024 01:40:03 +0100 Subject: [PATCH 3/3] Use artifact:// URIs --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1439eb9125..146971fd0a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -205,7 +205,7 @@ jobs: | data | ${{ needs.build-firmware.outputs.data_size }}B | ${{ steps.output-sizes-diff.outputs.data_diff }}B | | bss | ${{ needs.build-firmware.outputs.bss_size }}B | ${{ steps.output-sizes-diff.outputs.bss_diff }}B | - [Run in InfiniEmu](https://infiniemu.pipe01.net/?firmware=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.firmware_artifact }}.zip&resources=https://corsproxy.io/?https://nightly.link/${{ github.repository }}/actions/artifacts/${{ needs.build-firmware.outputs.resources_artifact }}.zip) + [Run in InfiniEmu](https://infiniemu.pipe01.net/?firmware=artifact://${{ github.repository }}/${{ needs.build-firmware.outputs.firmware_artifact }}&resources=artifact://${{ github.repository }}/${{ needs.build-firmware.outputs.resources_artifact }}) EOF - name: Upload comment