development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-01 05:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18825 from desktop/32-arms-are-fewer-than-64

Browse source 
Put the credential helper in mingw32 on arm64
This commit is contained in:
Markus Olsson 2024-06-12 16:55:55 +02:00 committed by GitHub
parent 066cce6df6 2ef91ff5c9
commit 53877e549d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
script/build.ts
View file

@ -34,6 +34,7 @@ import {
getExecutableName, getExecutableName,
isPublishable, isPublishable,
getIconFileName, getIconFileName,
getDistArchitecture,
} from './dist-info' } from './dist-info'
import { isGitHubActions } from './build-platforms' import { isGitHubActions } from './build-platforms'
@ -330,9 +331,10 @@ function copyDependencies() {
copySync(path.resolve(projectRoot, 'app/node_modules/dugite/git'), gitDir) copySync(path.resolve(projectRoot, 'app/node_modules/dugite/git'), gitDir)
console.log(' Copying desktop credential helper…') console.log(' Copying desktop credential helper…')
const mingw = getDistArchitecture() === 'x64' ? 'mingw64' : 'mingw32'
const gitCoreDir = const gitCoreDir =
process.platform === 'win32' process.platform === 'win32'
? path.resolve(outRoot, 'git', 'mingw64', 'libexec', 'git-core') ? path.resolve(outRoot, 'git', mingw, 'libexec', 'git-core')
: path.resolve(outRoot, 'git', 'libexec', 'git-core') : path.resolve(outRoot, 'git', 'libexec', 'git-core')
const desktopCredentialHelperTrampolineFile = const desktopCredentialHelperTrampolineFile =