Merge remote-tracking branch 'orig/main' into fix/download_git

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
             friendlyName: Windows
             nodeVersion: 16
             arch: x86
+            npm_config_arch: ia32
           - os: ubuntu-22.04
             friendlyName: Linux
     timeout-minutes: 10
@@ -44,7 +45,7 @@ jobs:
       - name: Install and build dependencies
         run: yarn
         env:
-          npm_config_arch: ${{ matrix.arch }}
+          npm_config_arch: ${{ matrix.npm_config_arch }}
       - name: Build
         run: yarn build
       - name: Lint

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dugite",
-  "version": "2.4.0",
+  "version": "2.5.2",
   "description": "Elegant bindings for Git",
   "main": "./build/lib/index.js",
   "typings": "./build/lib/index.d.ts",

script/config.js

@@ -14,6 +14,7 @@ function getConfig() {
     tempFile: ''
   }
 
+  // Possible values are ‘x64’, ‘arm’, ‘arm64’, ‘s390’, ‘s390x’, ‘mipsel’, ‘ia32’, ‘mips’, ‘ppc’ and ‘ppc64’
   let arch = os.arch();
 
   if (process.env.npm_config_arch) {
@@ -28,11 +29,6 @@ function getConfig() {
     arch = 'ia32';
   }
 
-  // Os.arch() calls it x32, we use x86 in actions, dugite-native calls it x86 and our embedded-git.json calls it ia32
-  if (arch === 'x32' || arch === 'x86') {
-    arch = 'ia32'
-  }
-
   const key = `${process.platform}-${arch}`
 
   const entry = embeddedGit[key]

script/embedded-git.json

@@ -1,27 +1,42 @@
 {
   "win32-x64": {
-    "name": "dugite-native-v2.39.2-ddb2ace-windows-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.2/dugite-native-v2.39.2-ddb2ace-windows-x64.tar.gz",
-    "checksum": "7d5a68de79c7ec981366c9543fc2f2c8e5160f8b41b3039767a046fc59e91367"
+    "name": "dugite-native-v2.39.3-91ebaa8-windows-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-windows-x64.tar.gz",
+    "checksum": "d52c40ac51637970ff8460308fe313daf27290e56a9cf92efbf2308551771660"
   },
   "win32-ia32": {
-    "name": "dugite-native-v2.39.2-ddb2ace-windows-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.2/dugite-native-v2.39.2-ddb2ace-windows-x86.tar.gz",
-    "checksum": "d9b75e5d2cbfc604e96a1b3822ac8b989898af39c9c9ed4bf05355d02f7cc778"
+    "name": "dugite-native-v2.39.3-91ebaa8-windows-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-windows-x86.tar.gz",
+    "checksum": "ec9d8c575e1c178c89093c391325b3b291f743f7530ffb9f023c3dd4dcc2d155"
   },
   "darwin-x64": {
-    "name": "dugite-native-v2.39.2-ddb2ace-macOS-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.2/dugite-native-v2.39.2-ddb2ace-macOS-x64.tar.gz",
-    "checksum": "63861250a026e1b0d7d126375139237c8342b3963b5d73df89912db4cb921d24"
+    "name": "dugite-native-v2.39.3-91ebaa8-macOS-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-macOS-x64.tar.gz",
+    "checksum": "84bcd256345a24ca087632aeb9a14989858f211883646bbd637dde56913a5017"
   },
   "darwin-arm64": {
-    "name": "dugite-native-v2.39.2-ddb2ace-macOS-arm64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.2/dugite-native-v2.39.2-ddb2ace-macOS-arm64.tar.gz",
-    "checksum": "09b58004239dad007f7ac53839d8f2ce53b966992fd49244fb163fb98c22c989"
+    "name": "dugite-native-v2.39.3-91ebaa8-macOS-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-macOS-arm64.tar.gz",
+    "checksum": "37467de076043b59d9af274fdef9c2a4e00f0c9112ba9e2b839eae90ea8a9628"
   },
   "linux-x64": {
-    "name": "dugite-native-v2.39.2-ddb2ace-ubuntu.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.2/dugite-native-v2.39.2-ddb2ace-ubuntu.tar.gz",
-    "checksum": "b08c173de92eecf653427810cbc9193efb3b39751690ec21196c79805038e738"
+    "name": "dugite-native-v2.39.3-91ebaa8-ubuntu-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-ubuntu-x64.tar.gz",
+    "checksum": "78375b97c802caa33c4ab585e3cf113001f0f53d0ab623ef0086e7c5b819189d"
+  },
+  "linux-ia32": {
+    "name": "dugite-native-v2.39.3-91ebaa8-ubuntu-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-ubuntu-x86.tar.gz",
+    "checksum": "1cd3511fc8a51556bdc88393cd344e0c084e7063c281137644765929ee092e8d"
+  },
+  "linux-arm": {
+    "name": "dugite-native-v2.39.3-91ebaa8-ubuntu-arm.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-ubuntu-arm.tar.gz",
+    "checksum": "331727414dc0d559758982f62adc9823c01e51ff302b5e5fe9e0cd783e5e1ea5"
+  },
+  "linux-arm64": {
+    "name": "dugite-native-v2.39.3-91ebaa8-ubuntu-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3-1/dugite-native-v2.39.3-91ebaa8-ubuntu-arm64.tar.gz",
+    "checksum": "8af507edf110a285b72e7bc884aa2a3cc2ca09b687f0ea1366d7806c488b7bb6"
   }
 }

script/update-embedded-git.js

@@ -14,7 +14,7 @@ get(`https://api.github.com/repos/desktop/dugite-native/releases/latest`).then(
       'darwin-x64': await findMacOSx64BitRelease(assets),
       'darwin-arm64': await findMacOSARM64BitRelease(assets),
       'linux-x64': await findLinux64BitRelease(assets),
-      'linux-x86': await findLinux32BitRelease(assets),
+      'linux-ia32': await findLinux32BitRelease(assets),
       'linux-arm': await findLinuxARM32BitRelease(assets),
       'linux-arm64': await findLinuxARM64BitRelease(assets)
     }

test/helpers.ts

@@ -1,8 +1,8 @@
 import { GitProcess, IGitResult, GitError } from '../lib'
 
 // NOTE: bump these versions to the latest stable releases
-export const gitVersion = '2.39.2'
-export const gitForWindowsVersion = '2.39.2.windows.1'
+export const gitVersion = '2.39.3'
+export const gitForWindowsVersion = '2.39.3.windows.1'
 export const gitLfsVersion = '3.3.0'
 
 const temp = require('temp').track()