Merge branch 'main' of https://github.com/pol-rivero/github-desktop-plus

Author: pol-rivero

.github/actions/setup-ci-environment/action.yml

@@ -37,3 +37,34 @@ runs:
       env:
         npm_config_arch: ${{ inputs.arch }}
         TARGET_ARCH: ${{ inputs.arch }}
+
+    - name: Install arm64 cross-compilation tools
+      if: ${{ runner.os == 'Linux' && inputs.arch == 'arm64' }}
+      shell: bash
+      run: |
+        sudo apt-get update -q
+        sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+
+    - name: Rebuild native modules for arm64
+      if: ${{ runner.os == 'Linux' && inputs.arch == 'arm64' }}
+      shell: bash
+      env:
+        CC: aarch64-linux-gnu-gcc
+        CXX: aarch64-linux-gnu-g++
+      run: |
+        NODE_GYP=node_modules/node-gyp/bin/node-gyp.js
+
+        # Rebuild printenvz (standalone executable, root node_modules)
+        (cd node_modules/printenvz && node ../../$NODE_GYP rebuild --arch=arm64)
+
+        # Rebuild process-proxy: its install script only builds for process.arch (x64),
+        # so we invoke node-gyp directly and copy the arm64 binary to the bin/ directory.
+        (cd node_modules/process-proxy && \
+          node ../../$NODE_GYP rebuild --arch=arm64 && \
+          cp build/Release/process-proxy-linux-arm64 bin/process-proxy-linux-arm64)
+
+        # Rebuild desktop-trampoline (standalone executables, app/node_modules)
+        (cd app/node_modules/desktop-trampoline && node ../../../$NODE_GYP rebuild --arch=arm64)
+
+        # Rebuild desktop-notifications (.node addon, app/node_modules)
+        (cd app/node_modules/desktop-notifications && node ../../../$NODE_GYP rebuild --arch=arm64)

app/src/lib/helpers/git-dir.ts

@@ -24,7 +24,11 @@ const getGitDirectoryBase = memoize((repository: Repository) => {
     // eslint-disable-next-line no-sync
     const contents = Fs.readFileSync(dotGit, 'utf8').trim()
     const gitDirPath = contents.replace(/^gitdir: /, '')
-    return Path.join(repository.path, gitDirPath)
+    if (Path.isAbsolute(gitDirPath)) {
+      return gitDirPath
+    } else {
+      return Path.join(repository.path, gitDirPath)
+    }
   } catch (e) {
     return dotGit
   }

script/build.ts

@@ -463,7 +463,7 @@ function copyDependencies() {
 
   console.log('  Copying process-proxy binary')
   cpSync(
-    getProxyCommandPath(),
+    getProxyCommandPath(process.platform, getDistArchitecture()),
     path.resolve(
       outRoot,
       process.platform === 'win32' ? 'process-proxy.exe' : 'process-proxy'