Drop 32-bit ARM

Author: pol-rivero

.github/workflows/ci.yml

@@ -338,8 +338,6 @@ jobs:
             sed -i "s/\[\[X86_64_SHA256\]\]/$x86_64_sha256/" $PKGBUILD_FILE
             aarch64_sha256=$(sha256sum artifacts/**/*-arm64.deb | awk '{ print $1 }')
             sed -i "s/\[\[AARCH64_SHA256\]\]/$aarch64_sha256/" $PKGBUILD_FILE
-            armv7h_sha256=$(sha256sum artifacts/**/*-armhf.deb | awk '{ print $1 }')
-            sed -i "s/\[\[ARMV7H_SHA256\]\]/$armv7h_sha256/" $PKGBUILD_FILE
           done
 
       - name: Publish AUR package github-desktop-plus-bin

README.md

@@ -135,9 +135,9 @@ chmod +x GitHub-Desktop-Plus-*-linux-*.AppImage
 # Just double-click the file to run it
 ```
 
-| **64-bit x86** | **64-bit ARM** | **32-bit ARM** |
-| --- | --- | --- |
-| `-linux-x86_64.AppImage` | `-linux-arm64.AppImage` | `-linux-armv7l.AppImage` |
+| **64-bit x86** | **64-bit ARM** |
+| --- | --- |
+| `-linux-x86_64.AppImage` | `-linux-arm64.AppImage` |
 
 </details>
 

publish/aur/PKGBUILD-bin.sh

@@ -8,7 +8,7 @@ pkgname="${_pkgname}-bin"
 pkgver=[[VERSION_WITHOUT_V]]
 pkgrel=1
 pkgdesc="Fork of GitHub Desktop with extra features and improvements (binary release)."
-arch=('x86_64' 'aarch64' 'armv7h')
+arch=('x86_64' 'aarch64')
 url="https://github.com/pol-rivero/github-desktop-plus"
 license=('MIT')
 provides=(${_pkgname})
@@ -33,15 +33,13 @@ source=(
 _common_download_url="${url}/releases/download/v${pkgver}/GitHubDesktopPlus-v${pkgver}-linux"
 source_x86_64=(${_common_download_url}-x86_64.deb)
 source_aarch64=(${_common_download_url}-arm64.deb)
-source_armv7h=(${_common_download_url}-armhf.deb)
 
 sha256sums=(
     '[[DESKTOP_FILE_SHA256]]'
     '[[LAUNCH_SCRIPT_SHA256]]'
 )
 sha256sums_x86_64=('[[X86_64_SHA256]]')
 sha256sums_aarch64=('[[AARCH64_SHA256]]')
-sha256sums_armv7h=('[[ARMV7H_SHA256]]')
 package() {
     INSTALL_DIR="$pkgdir/opt/${_pkgname}"
 

publish/aur/PKGBUILD-git.sh

@@ -10,7 +10,7 @@ pkgname="${_pkgname}-git"
 pkgver=0
 pkgrel=1
 pkgdesc="Fork of GitHub Desktop with extra features and improvements (git version)."
-arch=('x86_64' 'aarch64' 'armv7h')
+arch=('x86_64' 'aarch64')
 url="https://github.com/pol-rivero/github-desktop-plus"
 license=('MIT')
 provides=(${_pkgname})
@@ -77,7 +77,6 @@ package() {
     case "$CARCH" in
         x86_64) suffix="x64" ;;
         aarch64) suffix="arm64" ;;
-        armv7h) suffix="armv7l" ;;
         *) echo "Unsupported architecture: $CARCH"; exit 1 ;;
     esac
     cp -r --preserve=mode "dist/github-desktop-plus-linux-$suffix/"* "$INSTALL_DIR/"

publish/aur/PKGBUILD.sh

@@ -9,7 +9,7 @@ pkgname=github-desktop-plus
 pkgver=[[VERSION_WITHOUT_V]]
 pkgrel=1
 pkgdesc="Fork of GitHub Desktop with extra features and improvements."
-arch=('x86_64' 'aarch64' 'armv7h')
+arch=('x86_64' 'aarch64')
 url="https://github.com/pol-rivero/github-desktop-plus"
 license=('MIT')
 provides=($pkgname)
@@ -71,7 +71,6 @@ package() {
     case "$CARCH" in
         x86_64) suffix="x64" ;;
         aarch64) suffix="arm64" ;;
-        armv7h) suffix="armv7l" ;;
         *) echo "Unsupported architecture: $CARCH"; exit 1 ;;
     esac
     cp -r --preserve=mode "dist/github-desktop-plus-linux-$suffix/"* "$INSTALL_DIR/"

script/build.ts

@@ -137,19 +137,15 @@ function packageApp() {
     )
   }
 
-  const getPackageArch = (): 'arm64' | 'x64' | 'armv7l' => {
+  const getPackageArch = (): 'arm64' | 'x64' => {
     const arch = process.env.npm_config_arch || process.arch
 
     if (arch === 'arm64' || arch === 'x64') {
       return arch
     }
 
-    if (arch === 'arm') {
-      return 'armv7l'
-    }
-
     throw new Error(
-      `Building Desktop for architecture '${arch}' is not supported. Currently these architectures are supported: arm, arm64, x64`
+      `Building Desktop for architecture '${arch}' is not supported. Currently these architectures are supported: arm64, x64`
     )
   }
 

script/dist-info.ts

@@ -112,18 +112,14 @@ export const isPublishable = () =>
 export const getChannel = () =>
   process.env.RELEASE_CHANNEL ?? process.env.NODE_ENV ?? 'development'
 
-export function getDistArchitecture(): 'arm64' | 'x64' | 'armv7l' {
+export function getDistArchitecture(): 'arm64' | 'x64' {
   // If a specific npm_config_arch is set, we use that one instead of the OS arch (to support cross compilation)
   const arch = process.env.npm_config_arch || process.arch
 
-  if (arch === 'arm64' || arch === 'x64' || arch === 'armv7l') {
+  if (arch === 'arm64' || arch === 'x64') {
     return arch
   }
 
-  if (arch === 'arm') {
-    return 'armv7l'
-  }
-
   // TODO: Check if it's x64 running on an arm64 Windows with IsWow64Process2
   // More info: https://www.rudyhuyn.com/blog/2017/12/13/how-to-detect-that-your-x86-application-runs-on-windows-on-arm/
   // Right now (March 3, 2021) is not very important because support for x64

script/package-electron-builder.ts

@@ -14,8 +14,6 @@ function getArchitecture() {
   switch (arch) {
     case 'arm64':
       return '--arm64'
-    case 'arm':
-      return '--armv7l'
     default:
       return '--x64'
   }

script/package-redhat.ts

@@ -14,8 +14,6 @@ function getArchitecture() {
   switch (arch) {
     case 'arm64':
       return 'aarch64'
-    case 'arm':
-      return 'armv7l'
     default:
       return 'x86_64'
   }