From 344c230d76f3c6617c8f6ad10f64e9afb8b13fe3 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 13:19:05 +0530 Subject: [PATCH 01/26] Add linux armv7l --- .github/workflows/build.yml | 49 ++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 618d3a976aed4..e63a71d5bfece 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,11 +12,14 @@ jobs: strategy: matrix: node-version: [14.x] - runtime: [ linux-x64, linux-arm64, win-x64, osx-x64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, osx-x64 ] include: - runtime: linux-x64 os: ubuntu-latest + - runtime: linux-armv7l + os: ubuntu-latest + - runtime: linux-arm64 os: ubuntu-latest @@ -80,6 +83,10 @@ jobs: if: contains(matrix.runtime, 'x64') run: npm run build --if-present + - name: Build ARMv7l with Node.js ${{ matrix.node-version}} + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + run: npm run build:arm32 --if-present + - name: Build ARM64 with Node.js ${{ matrix.node-version}} if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') run: npm run build:arm64 --if-present @@ -91,7 +98,14 @@ jobs: name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_x64 path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip - - name: Upload Linux .zip ARM Artifact + - name: Upload Linux .zip ARMv7l Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + with: + name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_armv7l + path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip + + - name: Upload Linux .zip ARM64 Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') with: @@ -105,7 +119,14 @@ jobs: name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb - - name: Upload .deb ARM Artifact + - name: Upload .deb ARMv7l Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + with: + name: freetube_${{ steps.versionNumber.outputs.result }}_armhf.deb + path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb + + - name: Upload .deb ARM64 Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') with: @@ -119,7 +140,14 @@ jobs: name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.AppImage path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage - - name: Upload AppImage ARM Artifact + - name: Upload AppImage ARMv7l Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + with: + name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.AppImage + path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage + + - name: Upload AppImage ARM64 Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') with: @@ -132,8 +160,10 @@ jobs: with: name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.rpm path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm + + # rpm are not built for armv7l - - name: Upload .rpm ARM Artifact + - name: Upload .rpm ARM64 Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') with: @@ -147,7 +177,14 @@ jobs: name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_amd64.apk path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk - - name: Upload Alpine .apk ARM Artifact + - name: Upload Alpine .apk ARMv7l Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + with: + name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_armv7l.apk + path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.apk + + - name: Upload Alpine .apk ARM64 Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') with: From 6c4f3822dd0cb00ad48eaed10df8a4bf8cef1f91 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 13:43:45 +0530 Subject: [PATCH 02/26] Add linux armv7l --- .github/workflows/release.yml | 37 +++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 781c80e0b2f5a..26f380846bf76 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,14 @@ jobs: strategy: matrix: node-version: [14.x] - runtime: [ linux-x64, linux-arm64, win-x64, osx-x64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, osx-x64 ] include: - runtime: linux-x64 os: ubuntu-latest + - runtime: linux-armv7l + os: ubuntu-latest + - runtime: linux-arm64 os: ubuntu-latest @@ -49,6 +52,10 @@ jobs: if: contains(matrix.runtime, 'x64') run: npm run build --if-present + - name: Build ARMv7l with Node.js ${{ matrix.node-version}} + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + run: npm run build:arm32 --if-present + - name: Build ARM64 with Node.js ${{ matrix.node-version}} if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') run: npm run build:arm64 --if-present @@ -75,7 +82,18 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.zip asset_content_type: application/zip - - name: Upload Linux .zip ARM Release + - name: Upload Linux .zip ARMv7l Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-linux-portable-armv7l.zip + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-armv7l.zip + asset_content_type: application/zip + + - name: Upload Linux .zip ARM64 Release uses: actions/upload-release-asset@v1 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') env: @@ -97,7 +115,18 @@ jobs: asset_path: build/freetube_${{ env.PACKAGE_VERSION }}_amd64.deb asset_content_type: application/vnd.debian.binary-package - - name: Upload Linux .deb ARM Release + - name: Upload Linux .deb ARMv7l Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube_${{ env.PACKAGE_VERSION }}_armhf.deb + asset_path: build/freetube_${{ env.PACKAGE_VERSION }}_armv7l.deb + asset_content_type: application/vnd.debian.binary-package + + - name: Upload Linux .deb ARM64 Release uses: actions/upload-release-asset@v1 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') env: @@ -119,7 +148,7 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.x86_64.rpm asset_content_type: application/x-rpm - - name: Upload Linux .rpm ARM Release + - name: Upload Linux .rpm ARM64 Release uses: actions/upload-release-asset@v1 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') env: From 48832a75a10c1de72231f1b2ddfd2d38caca4db4 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:08:52 +0530 Subject: [PATCH 03/26] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 26f380846bf76..f9ff2c6d1b8e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -122,7 +122,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} - asset_name: freetube_${{ env.PACKAGE_VERSION }}_armhf.deb + asset_name: freetube_${{ env.PACKAGE_VERSION }}_armv7l.deb asset_path: build/freetube_${{ env.PACKAGE_VERSION }}_armv7l.deb asset_content_type: application/vnd.debian.binary-package From b06525dd735d63f2f923dc92c12aa19dc8c2b5d6 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 15:09:20 +0530 Subject: [PATCH 04/26] Update build.yml --- .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 e63a71d5bfece..731102b12c3b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -123,7 +123,7 @@ jobs: uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l') with: - name: freetube_${{ steps.versionNumber.outputs.result }}_armhf.deb + name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb - name: Upload .deb ARM64 Artifact From e9b8d692a2289ea67e637fef7ca792dad9844154 Mon Sep 17 00:00:00 2001 From: Jai A P <78354625+Jai-JAP@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:18:38 +0530 Subject: [PATCH 05/26] Update release.yml --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f9ff2c6d1b8e5..af2a0871239c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -147,6 +147,8 @@ jobs: asset_name: freetube_${{ env.PACKAGE_VERSION }}_amd64.rpm asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.x86_64.rpm asset_content_type: application/x-rpm + + # rpm are not built for armv7l - name: Upload Linux .rpm ARM64 Release uses: actions/upload-release-asset@v1 From 3d3910bb1699d8c3c8c58e7d7f694e13ef3d558a Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 5 May 2022 11:09:29 +0530 Subject: [PATCH 06/26] Update build.js --- _scripts/build.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/_scripts/build.js b/_scripts/build.js index 7052fca855dd8..9271b63fddaff 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -10,9 +10,21 @@ let targets var platform = os.platform() if (platform == 'darwin') { - targets = Platform.MAC.createTarget() + let arch = Arch.x64 + + if (args[2] === 'arm64') { + arch = Arch.arm64 + } + + targets = Platform.MAC.createTarget(['DMG','zip'], arch) } else if (platform == 'win32') { - targets = Platform.WINDOWS.createTarget() + let arch = Arch.x64 + + if (args[2] === 'arm64') { + arch = Arch.arm64 + } + + targets = Platform.WINDOWS.createTarget(['nsis', 'zip', 'portable', 'squirrel'], arch) } else if (platform == 'linux') { let arch = Arch.x64 From 83e6122444bbffdf9cb366cf0088d59fcb5bcaed Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 5 May 2022 11:16:06 +0530 Subject: [PATCH 07/26] Update release.yml --- .github/workflows/release.yml | 59 +++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af2a0871239c9..1de8151bde981 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: node-version: [14.x] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, osx-x64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] include: - runtime: linux-x64 os: ubuntu-latest @@ -26,9 +26,15 @@ jobs: - runtime: osx-x64 os: macOS-latest - + + - runtime: osx-arm64 + os: macOS-latest + - runtime: win-x64 os: windows-latest + + - runtime: win-arm64 + os: windows-latest runs-on: ${{ matrix.os }} @@ -57,7 +63,7 @@ jobs: run: npm run build:arm32 --if-present - name: Build ARM64 with Node.js ${{ matrix.node-version}} - if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') + if: contains(matrix.runtime, 'arm64') run: npm run build:arm64 --if-present - name: Upload AppImage x64 Release @@ -161,9 +167,9 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.aarch64.rpm asset_content_type: application/x-rpm - - name: Upload Windows .exe Release + - name: Upload Windows x64 .exe Release uses: actions/upload-release-asset@v1 - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -172,9 +178,20 @@ jobs: asset_path: build/freetube Setup ${{ env.PACKAGE_VERSION }}.exe asset_content_type: application/x-ms-dos-executable - - name: Upload Windows .zip Release + - name: Upload Windows arm64 .exe Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-setup-arm64.exe + asset_path: build/freetube Setup ${{ env.PACKAGE_VERSION }}.exe + asset_content_type: application/x-ms-dos-executable + + - name: Upload Windows x64 .zip Release uses: actions/upload-release-asset@v1 - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -183,13 +200,35 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-win.zip asset_content_type: application/zip - - name: Upload Mac .dmg Release + - name: Upload Windows arm64 .zip Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-win-arm64-portable.zip + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-win.zip + asset_content_type: application/zip + + - name: Upload Mac x64 .dmg Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-x64.dmg + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.dmg + asset_content_type: application/x-apple-diskimage + + - name: Upload Mac arm64 .dmg Release uses: actions/upload-release-asset@v1 - if: startsWith(matrix.os, 'macos') + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} - asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac.dmg + asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.dmg asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.dmg asset_content_type: application/x-apple-diskimage From cbed93b58a48ae012112c05959bafdb303448249 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 5 May 2022 11:32:10 +0530 Subject: [PATCH 08/26] Update build.yml --- .github/workflows/build.yml | 64 ++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 731102b12c3b3..2ddd624ae1d8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: node-version: [14.x] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, osx-x64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] include: - runtime: linux-x64 os: ubuntu-latest @@ -26,9 +26,15 @@ jobs: - runtime: osx-x64 os: macOS-latest + - runtime: osx-arm64 + os: macOS-latest + - runtime: win-x64 os: windows-latest + - runtime: win-arm64 + os: windows-latest + runs-on: ${{ matrix.os }} steps: @@ -76,7 +82,7 @@ jobs: - name: Install libarchive-tools - if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64') + if: startsWith(matrix.os, 'ubuntu') run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}" - name: Build x64 with Node.js ${{ matrix.node-version}} @@ -88,7 +94,7 @@ jobs: run: npm run build:arm32 --if-present - name: Build ARM64 with Node.js ${{ matrix.node-version}} - if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64') + if: contains(matrix.runtime, 'arm64') run: npm run build:arm64 --if-present - name: Upload Linux .zip x64 Artifact @@ -205,30 +211,58 @@ jobs: # name: freetube_${{ steps.versionNumber.outputs.result }}_static_web # path: dist/web - - name: Upload Windows .exe Artifact + - name: Upload Windows x64 .exe Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe + path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe + + - name: Upload Windows arm64 .exe Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe + path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe + + - name: Upload Windows x64 .zip Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') with: name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip - - name: Upload Windows .zip Artifact + - name: Upload Windows arm64 .zip Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') with: - name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe - path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe - - - name: Upload Windows Portable Artifact + name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable + path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip + + - name: Upload Windows x64 Portable Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'windows') + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') with: name: freetube-${{ steps.versionNumber.outputs.result }}-portable-x64.exe path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe - - name: Upload Mac .dmg Artifact + - name: Upload Windows arm64 Portable Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-portable-arm64.exe + path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe + + - name: Upload Mac x64 .dmg Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg + path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg + + - name: Upload Mac arm64 .dmg Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'macos') + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') with: - name: freetube-${{ steps.versionNumber.outputs.result }}-mac.dmg + name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg From e291e00d30d943a6cc93d8a284b4f41b5fd4faf2 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 5 May 2022 11:36:10 +0530 Subject: [PATCH 09/26] Update release.yml --- .github/workflows/release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1de8151bde981..58816a8f6cf81 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -211,6 +211,28 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-win.zip asset_content_type: application/zip + - name: Upload Windows x64 portable Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-win-x64-portable.exe + asset_path: build/FreeTube ${{ env.PACKAGE_VERSION }}.exe + asset_content_type: application/x-ms-dos-executable + + - name: Upload Windows arm64 portable Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-win-arm64-portable.exe + asset_path: build/FreeTube ${{ env.PACKAGE_VERSION }}.exe + asset_content_type: application/x-ms-dos-executable + - name: Upload Mac x64 .dmg Release uses: actions/upload-release-asset@v1 if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64') From 172b5b8d2729d259b4c59404480cd4e4b5b6b1a1 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Tue, 31 May 2022 18:51:47 +0530 Subject: [PATCH 10/26] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0cf0269430040..220068f0f749e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,9 @@ jobs: build: strategy: matrix: - node-version: [14.x] + node-version: [16.x] runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] - include: + include: - runtime: linux-x64 os: ubuntu-latest From 6a7b68c75dfe7d84290e8bdac3caccabfe78009e Mon Sep 17 00:00:00 2001 From: Jai A P Date: Tue, 31 May 2022 18:52:24 +0530 Subject: [PATCH 11/26] Update build.yml --- .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 5849a064867ee..a5c73660165d2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: build: strategy: matrix: - node-version: [16.x] + node-version: [16.x] runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] include: - runtime: linux-x64 From 40093071eafafe21f9c386cfee72f062ead7597f Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 22 Jun 2022 20:40:15 +0530 Subject: [PATCH 12/26] Update _scripts/build.js Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> --- _scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_scripts/build.js b/_scripts/build.js index 8f750ddad8c70..73ef9b5a2f560 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -10,7 +10,7 @@ let targets const platform = os.platform() const cpus = os.cpus() -if (platform == 'darwin') { +if (platform === 'darwin') { let arch = Arch.x64 if (args[2] === 'arm64') { From bab9ce4e65ebd593e2fa80afe3eb16f456c8e0fe Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 22 Jun 2022 20:40:26 +0530 Subject: [PATCH 13/26] Update _scripts/build.js Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> --- _scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_scripts/build.js b/_scripts/build.js index 73ef9b5a2f560..31a3616ee5a2f 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -18,7 +18,7 @@ if (platform === 'darwin') { } targets = Platform.MAC.createTarget(['DMG','zip'], arch) -} else if (platform == 'win32') { +} else if (platform === 'win32') { let arch = Arch.x64 if (args[2] === 'arm64') { From 1bbbbe54586c586036465c6aced1d7c693370f28 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Wed, 22 Jun 2022 20:41:05 +0530 Subject: [PATCH 14/26] Update _scripts/build.js Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com> --- _scripts/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_scripts/build.js b/_scripts/build.js index 31a3616ee5a2f..96522bc85db6d 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -26,7 +26,7 @@ if (platform === 'darwin') { } targets = Platform.WINDOWS.createTarget(['nsis', 'zip', 'portable', 'squirrel'], arch) -} else if (platform == 'linux') { +} else if (platform === 'linux') { let arch = Arch.x64 if (args[2] === 'arm64') { From 9304ab89afb43460c4a78e3ade6dd45f99bc87a6 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 09:59:11 +0530 Subject: [PATCH 15/26] Update build.yml --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5c73660165d2..001d20ffa24af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ name: Build on: push: branches: [ master, development, '**-RC' ] + workflow_dispatch: jobs: build: From c6eed9b381a97348413f818358c25e1968aa984e Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 10:33:02 +0530 Subject: [PATCH 16/26] Update build.yml --- .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 001d20ffa24af..93f0e580f0130 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -238,7 +238,7 @@ jobs: if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64') with: name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable - path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip + path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip - name: Upload Windows x64 Portable Artifact uses: actions/upload-artifact@v2 @@ -266,4 +266,4 @@ jobs: if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') with: name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg - path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg + path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg From b3c64e380dfe8bedff3a31cf5d2ca4aa974ed10a Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 10:33:58 +0530 Subject: [PATCH 17/26] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 220068f0f749e..c146edeaec86f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -208,7 +208,7 @@ jobs: with: upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} asset_name: freetube-${{ env.PACKAGE_VERSION }}-win-arm64-portable.zip - asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-win.zip + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64-win.zip asset_content_type: application/zip - name: Upload Windows x64 portable Release @@ -252,5 +252,5 @@ jobs: with: upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.dmg - asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.dmg + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64.dmg asset_content_type: application/x-apple-diskimage From 6e11288da1dd0274e0bfd09b118ac719e6c8b1e7 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 10:35:43 +0530 Subject: [PATCH 18/26] Remove squirrel build from windows as unused --- _scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_scripts/build.js b/_scripts/build.js index 96522bc85db6d..bce28b9d37927 100644 --- a/_scripts/build.js +++ b/_scripts/build.js @@ -25,7 +25,7 @@ if (platform === 'darwin') { arch = Arch.arm64 } - targets = Platform.WINDOWS.createTarget(['nsis', 'zip', 'portable', 'squirrel'], arch) + targets = Platform.WINDOWS.createTarget(['nsis', 'zip', 'portable'], arch) } else if (platform === 'linux') { let arch = Arch.x64 @@ -117,7 +117,7 @@ const config = { }, win: { icon: '_icons/icon.ico', - target: ['nsis', 'zip', 'portable', 'squirrel'], + target: ['nsis', 'zip', 'portable'], }, nsis: { allowToChangeInstallationDirectory: true, From 9013af733666947ae2685764a40cffa63029c136 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 11:36:06 +0530 Subject: [PATCH 19/26] Update build.yml --- .github/workflows/build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93f0e580f0130..1796a13fb6736 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -267,3 +267,17 @@ jobs: with: name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg + + - name: Upload Mac x64 .zip Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip + path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip + + - name: Upload Mac arm64 .zip Artifact + uses: actions/upload-artifact@v2 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') + with: + name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip + path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip From a829ddd2829ade2082f0dded780d18bb1c32c35c Mon Sep 17 00:00:00 2001 From: Jai A P Date: Thu, 23 Jun 2022 11:38:41 +0530 Subject: [PATCH 20/26] Update release.yml --- .github/workflows/release.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c146edeaec86f..e50ae6b6b2f61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -254,3 +254,26 @@ jobs: asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.dmg asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64.dmg asset_content_type: application/x-apple-diskimage + + - name: Upload Mac x64 .zip Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-x64.zip + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-mac.zip + asset_content_type: application/x-apple-diskimage + + - name: Upload Mac arm64 .zip Release + uses: actions/upload-release-asset@v1 + if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} + asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.zip + asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64-mac.zip + asset_content_type: application/x-apple-diskimage + From 4484b49637b0ba3f5d1424e440ee862b2b7b7947 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 26 Jun 2022 09:15:20 +0530 Subject: [PATCH 21/26] Update build.yml --- .github/workflows/build.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1796a13fb6736..424982a1f2ed7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,8 @@ jobs: strategy: matrix: node-version: [16.x] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] +# runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64 ] include: - runtime: linux-x64 os: ubuntu-18.04 @@ -27,8 +28,8 @@ jobs: - runtime: osx-x64 os: macOS-latest - - runtime: osx-arm64 - os: macOS-latest +# - runtime: osx-arm64 +# os: macOS-latest - runtime: win-x64 os: windows-latest @@ -275,9 +276,9 @@ jobs: name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip - - name: Upload Mac arm64 .zip Artifact - uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') - with: - name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip - path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip +# - name: Upload Mac arm64 .zip Artifact +# uses: actions/upload-artifact@v2 +# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') +# with: +# name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip +# path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip From 88eab30cfc1ae2ebdfa2eb00ac3f77a65e92c088 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 26 Jun 2022 09:16:43 +0530 Subject: [PATCH 22/26] Update release.yml --- .github/workflows/release.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e50ae6b6b2f61..edbc35813e40d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,8 @@ jobs: strategy: matrix: node-version: [16.x] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] +# runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] + runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64 ] include: - runtime: linux-x64 os: ubuntu-latest @@ -27,8 +28,8 @@ jobs: - runtime: osx-x64 os: macOS-latest - - runtime: osx-arm64 - os: macOS-latest +# - runtime: osx-arm64 +# os: macOS-latest - runtime: win-x64 os: windows-latest @@ -266,14 +267,14 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-mac.zip asset_content_type: application/x-apple-diskimage - - name: Upload Mac arm64 .zip Release - uses: actions/upload-release-asset@v1 - if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} - asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.zip - asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64-mac.zip - asset_content_type: application/x-apple-diskimage +# - name: Upload Mac arm64 .zip Release +# uses: actions/upload-release-asset@v1 +# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} +# asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.zip +# asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64-mac.zip +# asset_content_type: application/x-apple-diskimage From 3dfa6e9f5af8ac4a462a5b42d7946c308548ccd5 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 26 Jun 2022 09:39:30 +0530 Subject: [PATCH 23/26] Update build.yml --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 424982a1f2ed7..31219fa4ca63a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -262,12 +262,12 @@ jobs: name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg - - name: Upload Mac arm64 .dmg Artifact - uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') - with: - name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg - path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg +# - name: Upload Mac arm64 .dmg Artifact +# uses: actions/upload-artifact@v2 +# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') +# with: +# name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg +# path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg - name: Upload Mac x64 .zip Artifact uses: actions/upload-artifact@v2 From 1fe58060f89fdeef88845f4ca2161ce7e164cee2 Mon Sep 17 00:00:00 2001 From: Jai A P Date: Sun, 26 Jun 2022 09:40:26 +0530 Subject: [PATCH 24/26] Update release.yml --- .github/workflows/release.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index edbc35813e40d..699a936d8508a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -245,16 +245,16 @@ jobs: asset_path: build/freetube-${{ env.PACKAGE_VERSION }}.dmg asset_content_type: application/x-apple-diskimage - - name: Upload Mac arm64 .dmg Release - uses: actions/upload-release-asset@v1 - if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} - asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.dmg - asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64.dmg - asset_content_type: application/x-apple-diskimage +# - name: Upload Mac arm64 .dmg Release +# uses: actions/upload-release-asset@v1 +# if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64') +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# with: +# upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label} +# asset_name: freetube-${{ env.PACKAGE_VERSION }}-mac-arm64.dmg +# asset_path: build/freetube-${{ env.PACKAGE_VERSION }}-arm64.dmg +# asset_content_type: application/x-apple-diskimage - name: Upload Mac x64 .zip Release uses: actions/upload-release-asset@v1 From 266ddafc590dc1ce71ea0493be9f14031c52da0a Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 27 Jun 2022 13:27:32 +0530 Subject: [PATCH 25/26] Update .github/workflows/release.yml Co-authored-by: PikachuEXE --- .github/workflows/release.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 699a936d8508a..0a3d0047581ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,8 +13,16 @@ jobs: strategy: matrix: node-version: [16.x] -# runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64 ] + runtime: + - linux-x64 + - linux-armv7l + - linux-arm64 + - win-x64 + - win-arm64 + - osx-x64 + # `osx-arm64` disabled due to "macOS gatekeeper" + # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113 + # - osx-arm64 include: - runtime: linux-x64 os: ubuntu-latest From 9af61bcba3d1c662b5620cd9daecbe2d5cef476d Mon Sep 17 00:00:00 2001 From: Jai A P Date: Mon, 27 Jun 2022 13:27:45 +0530 Subject: [PATCH 26/26] Update .github/workflows/build.yml Co-authored-by: PikachuEXE --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31219fa4ca63a..2736cbf3afe23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,8 +13,16 @@ jobs: strategy: matrix: node-version: [16.x] -# runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64, osx-arm64 ] - runtime: [ linux-x64, linux-armv7l, linux-arm64, win-x64, win-arm64, osx-x64 ] + runtime: + - linux-x64 + - linux-armv7l + - linux-arm64 + - win-x64 + - win-arm64 + - osx-x64 + # `osx-arm64` disabled due to "macOS gatekeeper" + # See details in https://github.com/FreeTubeApp/FreeTube/pull/2113 + # - osx-arm64 include: - runtime: linux-x64 os: ubuntu-18.04