From 2cd098938beb05f40fe5a0890836ad347397d4fb Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 22:19:37 -0400 Subject: [PATCH 01/12] Test ARM64 Build Logic --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43bb134a7..7aaa406f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,12 +43,18 @@ jobs: with: name: freetube-vue_0.8.0_amd64.rpm path: build/freetube-vue-0.8.0.x86_64.rpm - - name: Upload Linux .zip Artifact + - name: Build with ARM64 + uses: uraimo/run-on-arch-action@v1.0.9 + if: startsWith(matrix.os, 'ubuntu') + - run: npm ci + - run: npm run lint + - run: npm run build --if-present + - name: Upload Linux ARM64 .deb Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') with: - name: freetube-vue_0.8.0_amd64.zip - path: build/freetube-vue-0.8.0.zip + name: freetube-vue_0.8.0_arm64.deb + path: build/freetube-vue_0.8.0_arm64.deb - name: Upload Windows .exe Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'windows') From 091487529613b846d8b2c778c002563e5a45ba8f Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 22:33:26 -0400 Subject: [PATCH 02/12] Update build.yml --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7aaa406f8..ec97151e4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,11 +44,15 @@ jobs: name: freetube-vue_0.8.0_amd64.rpm path: build/freetube-vue-0.8.0.x86_64.rpm - name: Build with ARM64 - uses: uraimo/run-on-arch-action@v1.0.9 if: startsWith(matrix.os, 'ubuntu') - - run: npm ci - - run: npm run lint - - run: npm run build --if-present + uses: uraimo/run-on-arch-action@v1.0.9 + with: + architecture: armv7 + distribution: ubuntu18.04 + run: | + npm ci + npm run lint + npm run build --if-present - name: Upload Linux ARM64 .deb Artifact uses: actions/upload-artifact@v2 if: startsWith(matrix.os, 'ubuntu') From 93e96185efa16e08b84f96e40cda56df5831a019 Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 22:47:38 -0400 Subject: [PATCH 03/12] Update build.yml --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec97151e4..a98a9a2a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,9 +47,13 @@ jobs: if: startsWith(matrix.os, 'ubuntu') uses: uraimo/run-on-arch-action@v1.0.9 with: - architecture: armv7 + architecture: aarch64 distribution: ubuntu18.04 run: | + apt update + curl -sL https://deb.nodesource.com/setup_12.x | -E bash - + apt install -y nodejs + apt install -y build-essential npm ci npm run lint npm run build --if-present From 8840e1c38ac3a609479ad4e4445fd6655e55193a Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 23:04:10 -0400 Subject: [PATCH 04/12] 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 a98a9a2a6..9b31c3db5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,6 +54,7 @@ jobs: curl -sL https://deb.nodesource.com/setup_12.x | -E bash - apt install -y nodejs apt install -y build-essential + apt install npm npm ci npm run lint npm run build --if-present From 6c60a9c6274b808080271c43d042207ffee6cd25 Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 23:18:22 -0400 Subject: [PATCH 05/12] 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 9b31c3db5..de0b2cc35 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,7 @@ jobs: curl -sL https://deb.nodesource.com/setup_12.x | -E bash - apt install -y nodejs apt install -y build-essential - apt install npm + apt install -y npm npm ci npm run lint npm run build --if-present From 76bc9deb3d4c0f2287e4d92316473ae362383d15 Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 23:30:51 -0400 Subject: [PATCH 06/12] 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 de0b2cc35..00f8a5a18 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: distribution: ubuntu18.04 run: | apt update + apt install -y curl curl -sL https://deb.nodesource.com/setup_12.x | -E bash - apt install -y nodejs apt install -y build-essential From 4ebea0204211e48b89fce1d6bca0058f167f48df Mon Sep 17 00:00:00 2001 From: Preston Date: Sat, 11 Jul 2020 23:35:06 -0400 Subject: [PATCH 07/12] 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 00f8a5a18..8ef72e2e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: apt install -y nodejs apt install -y build-essential apt install -y npm - npm ci + npm install npm run lint npm run build --if-present - name: Upload Linux ARM64 .deb Artifact From 9026cd5785ec3dfd823063b721e9499332e89645 Mon Sep 17 00:00:00 2001 From: Preston Date: Sun, 12 Jul 2020 10:52:39 -0400 Subject: [PATCH 08/12] 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 8ef72e2e7..d0964d55c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,9 +50,9 @@ jobs: architecture: aarch64 distribution: ubuntu18.04 run: | - apt update apt install -y curl - curl -sL https://deb.nodesource.com/setup_12.x | -E bash - + curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - + apt update apt install -y nodejs apt install -y build-essential apt install -y npm From 218dc2937fb0ce3ef0fb8561a139d929e5c177bf Mon Sep 17 00:00:00 2001 From: Preston Date: Sun, 12 Jul 2020 11:19:27 -0400 Subject: [PATCH 09/12] Update build.yml --- .github/workflows/build.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d0964d55c..9b84fadfc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,12 +50,7 @@ jobs: architecture: aarch64 distribution: ubuntu18.04 run: | - apt install -y curl - curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - - apt update - apt install -y nodejs - apt install -y build-essential - apt install -y npm + snap install node npm install npm run lint npm run build --if-present From 68f84b3c5423b79080c409009401c1d951b45af0 Mon Sep 17 00:00:00 2001 From: Preston Date: Sun, 12 Jul 2020 11:31:25 -0400 Subject: [PATCH 10/12] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b84fadfc..27eeab685 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,8 @@ jobs: architecture: aarch64 distribution: ubuntu18.04 run: | + apt update + apt install -y snapd snap install node npm install npm run lint From 2ce327d34593d76c031bf00944fe5a20a7f10207 Mon Sep 17 00:00:00 2001 From: Preston Date: Sun, 12 Jul 2020 11:54:12 -0400 Subject: [PATCH 11/12] Update build.yml --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 27eeab685..3e42379d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,11 +48,14 @@ jobs: uses: uraimo/run-on-arch-action@v1.0.9 with: architecture: aarch64 - distribution: ubuntu18.04 + distribution: ubuntu20.04 run: | + apt install -y curl + curl -sL https://rpm.nodesource.com/setup_lts.x | bash - apt update - apt install -y snapd - snap install node + apt install -y nodejs + apt install -y build-essential + apt install -y npm npm install npm run lint npm run build --if-present From a2a594980cf1a3d8e88c8f84db5ce68e5def4428 Mon Sep 17 00:00:00 2001 From: Preston Date: Sun, 12 Jul 2020 13:41:05 -0400 Subject: [PATCH 12/12] Test different method for arm builds --- .github/workflows/build.yml | 38 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e42379d3..dab8c5545 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,19 @@ jobs: strategy: matrix: node-version: [12.x] - os: [ubuntu-latest, windows-latest, macos-latest] + runtime: [ linux-x64, linux-arm64, win-x64, osx-x64 ] + include: + - runtime: linux-x64 + os: ubuntu-latest + + - runtime: linux-arm64 + os: ubuntu-latest + + - runtime: osx-x64 + os: macOS-latest + + - runtime: win-x64 + os: windows-latest runs-on: ${{ matrix.os }} @@ -27,41 +39,25 @@ jobs: - run: npm run build --if-present - name: Upload .deb Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'ubuntu') + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64') with: name: freetube-vue_0.8.0_amd64.deb path: build/freetube-vue_0.8.0_amd64.deb - name: Upload AppImage Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'ubuntu') + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64') with: name: freetube-vue_0.8.0_amd64.AppImage path: build/FreeTube-Vue-0.8.0.AppImage - name: Upload .rpm Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'ubuntu') + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64') with: name: freetube-vue_0.8.0_amd64.rpm path: build/freetube-vue-0.8.0.x86_64.rpm - - name: Build with ARM64 - if: startsWith(matrix.os, 'ubuntu') - uses: uraimo/run-on-arch-action@v1.0.9 - with: - architecture: aarch64 - distribution: ubuntu20.04 - run: | - apt install -y curl - curl -sL https://rpm.nodesource.com/setup_lts.x | bash - - apt update - apt install -y nodejs - apt install -y build-essential - apt install -y npm - npm install - npm run lint - npm run build --if-present - name: Upload Linux ARM64 .deb Artifact uses: actions/upload-artifact@v2 - if: startsWith(matrix.os, 'ubuntu') + if: startsWith(matrix.os, 'ubuntu-latest') && startsWith(matrix.runtime, 'linux-arm64') with: name: freetube-vue_0.8.0_arm64.deb path: build/freetube-vue_0.8.0_arm64.deb