From a8a9307e0df190e32b5fdef1f4906aef8a84f59a Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 18:26:23 +0100 Subject: [PATCH 1/6] WIP: migration of actions v3 to v4. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7c6d53..2ad5575 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,7 @@ jobs: npm run build - name: Upload [GitHub Actions] - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.JOB_TRANSFER_ARTIFACT }} path: dist @@ -121,13 +121,13 @@ jobs: steps: - name: Download job transfer artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.JOB_TRANSFER_ARTIFACT }} path: ${{ env.JOB_TRANSFER_ARTIFACT }} - name: Upload tester build artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact.name }} path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }} @@ -138,7 +138,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Download [GitHub Actions] - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.JOB_TRANSFER_ARTIFACT }} path: ${{ env.JOB_TRANSFER_ARTIFACT }} From 37100c8746e96e91433feb9287590592496f9481 Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 18:41:12 +0100 Subject: [PATCH 2/6] WIP: artifacts v4 upgrade. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ad5575..856bacd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -129,7 +129,7 @@ jobs: - name: Upload tester build artifact uses: actions/upload-artifact@v4 with: - name: ${{ matrix.artifact.name }} + name: ${{ matrix.artifact.name }}-${{ github.run_id }} path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }} release: From 7483819b8b5239336692a20ac48da0eda0cc60ce Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 18:46:36 +0100 Subject: [PATCH 3/6] WIP: artifacts v4 upgrade. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 856bacd..e3c512a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,8 +123,8 @@ jobs: - name: Download job transfer artifact uses: actions/download-artifact@v4 with: - name: ${{ env.JOB_TRANSFER_ARTIFACT }} - path: ${{ env.JOB_TRANSFER_ARTIFACT }} + name: ${{ matrix.artifact.name }}-${{ github.run_id }} + path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }} - name: Upload tester build artifact uses: actions/upload-artifact@v4 From 8eaf5845e656714b640ab3a776617d2306906b93 Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 18:52:42 +0100 Subject: [PATCH 4/6] WIP: artifacts v4 upgrade. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3c512a..ea5ba8c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,8 +123,8 @@ jobs: - name: Download job transfer artifact uses: actions/download-artifact@v4 with: - name: ${{ matrix.artifact.name }}-${{ github.run_id }} - path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }} + name: ${{ env.JOB_TRANSFER_ARTIFACT }} # Keep this as is + path: ${{ env.JOB_TRANSFER_ARTIFACT }} - name: Upload tester build artifact uses: actions/upload-artifact@v4 From f68c83590e7c1571662dbf8662acf174e84c3e8f Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 19:01:23 +0100 Subject: [PATCH 5/6] WIP: artifacts v4 upgrade. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea5ba8c..c1bd415 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,13 @@ jobs: matrix: config: - os: [self-hosted, windows-sign-pc] + id: windows - os: ubuntu-latest + id: linux - os: macos-13 + id: macos-x64 - os: macos-14 + id: macos-arm64 runs-on: ${{ matrix.config.os }} timeout-minutes: 90 @@ -94,7 +98,7 @@ jobs: - name: Upload [GitHub Actions] uses: actions/upload-artifact@v4 with: - name: ${{ env.JOB_TRANSFER_ARTIFACT }} + name: ${{ env.JOB_TRANSFER_ARTIFACT }}-${{ matrix.config.id }} path: dist artifacts: @@ -108,28 +112,34 @@ jobs: artifact: - path: "*-linux_x64.zip" name: Arduino-Lab-for-MicroPython_Linux_X86-64 + id: linux - path: "*-mac_x64.zip" name: Arduino-Lab-for-MicroPython_macOS_X86-64 + id: macos-x64 - path: "*-mac_arm64.zip" name: Arduino-Lab-for-MicroPython_macOS_arm-64 + id: macos-arm64 # - path: "*Windows_64bit.exe" # name: Windows_X86-64_interactive_installer + # id: windows # - path: "*Windows_64bit.msi" # name: Windows_X86-64_MSI + # id: windows - path: "*-win_x64.zip" name: Arduino-Lab-for-MicroPython_Windows_X86-64 + id: windows steps: - name: Download job transfer artifact uses: actions/download-artifact@v4 with: - name: ${{ env.JOB_TRANSFER_ARTIFACT }} # Keep this as is + name: ${{ env.JOB_TRANSFER_ARTIFACT }}-${{ matrix.artifact.id }} path: ${{ env.JOB_TRANSFER_ARTIFACT }} - name: Upload tester build artifact uses: actions/upload-artifact@v4 with: - name: ${{ matrix.artifact.name }}-${{ github.run_id }} + name: ${{ matrix.artifact.name }} path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }} release: @@ -137,23 +147,25 @@ jobs: if: github.repository == 'arduino/lab-micropython-editor' && startsWith(github.ref, 'refs/tags/') runs-on: ubuntu-latest steps: - - name: Download [GitHub Actions] + - name: Download all artifacts uses: actions/download-artifact@v4 with: - name: ${{ env.JOB_TRANSFER_ARTIFACT }} - path: ${{ env.JOB_TRANSFER_ARTIFACT }} + path: artifacts + + - name: List artifacts + run: ls -R artifacts - name: Get Tag id: tag_name run: | - echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/} + echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT - name: Publish Release [GitHub] uses: svenstaro/upload-release-action@2.2.0 with: repo_token: ${{ secrets.GITHUB_TOKEN }} release_name: ${{ steps.tag_name.outputs.TAG_NAME }} - file: ${{ env.JOB_TRANSFER_ARTIFACT }}/* + file: artifacts/**/* tag: ${{ github.ref }} file_glob: true @@ -167,7 +179,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Remove unneeded job transfer artifact + - name: Remove unneeded job transfer artifacts uses: geekyeggo/delete-artifact@v2 with: - name: ${{ env.JOB_TRANSFER_ARTIFACT }} + name: | + ${{ env.JOB_TRANSFER_ARTIFACT }}-windows + ${{ env.JOB_TRANSFER_ARTIFACT }}-linux + ${{ env.JOB_TRANSFER_ARTIFACT }}-macos-x64 + ${{ env.JOB_TRANSFER_ARTIFACT }}-macos-arm64 \ No newline at end of file From 2fc901a189eed845db650cb7aa606b868594f636 Mon Sep 17 00:00:00 2001 From: ubi de feo Date: Mon, 3 Mar 2025 21:08:08 +0100 Subject: [PATCH 6/6] WIP: migrating actions v3 to v4 - universal mac build. Signed-off-by: ubi de feo --- .github/workflows/build.yml | 15 +++++---------- package.json | 5 ++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1bd415..318b18a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,8 @@ jobs: id: windows - os: ubuntu-latest id: linux - - os: macos-13 - id: macos-x64 - - os: macos-14 - id: macos-arm64 + - os: macos-latest + id: macos-universal runs-on: ${{ matrix.config.os }} timeout-minutes: 90 @@ -113,12 +111,9 @@ jobs: - path: "*-linux_x64.zip" name: Arduino-Lab-for-MicroPython_Linux_X86-64 id: linux - - path: "*-mac_x64.zip" - name: Arduino-Lab-for-MicroPython_macOS_X86-64 - id: macos-x64 - - path: "*-mac_arm64.zip" - name: Arduino-Lab-for-MicroPython_macOS_arm-64 - id: macos-arm64 + - path: "*-mac_universal.zip" + name: Arduino-Lab-for-MicroPython_macOS_Universal + id: macos-universal # - path: "*Windows_64bit.exe" # name: Windows_X86-64_interactive_installer # id: windows diff --git a/package.json b/package.json index b3f5abb..751e1db 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,10 @@ "artifactName": "${productName}-${os}_${arch}.${ext}", "extraResources": "./ui/arduino/helpers.py", "mac": { - "target": "zip", + "target": [{ + "target": "zip", + "arch": ["universal"] + }], "icon": "build_resources/icon.icns" }, "win": { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy