Merge branch 'main' into release/3.0.0-rc2

desktop · Jun 5, 2024 · d5fbace · d5fbace
2 parents 9924910 + c3af62e
commit d5fbace
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 26 deletions.
diff --git a/script/embedded-git.json b/script/embedded-git.json
@@ -1,42 +1,42 @@
 {
   "win32-x64": {
-    "name": "dugite-native-v2.43.4-1074931-windows-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-windows-x64.tar.gz",
-    "checksum": "a1ce9ad3243a44b7b4b86056bfbc2238514faaaa8fad5da12d4483491347aace"
+    "name": "dugite-native-v2.45.1-e87d290-windows-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-windows-x64.tar.gz",
+    "checksum": "6a79708447291d8b95db9f523f949389d63fca1a25b72520d1a0b9a8d7ede3e1"
   },
   "win32-ia32": {
-    "name": "dugite-native-v2.43.4-1074931-windows-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-windows-x86.tar.gz",
-    "checksum": "6edd41d81bee1ad11dfa9db84bce74afafa59edd27fcd8cf836b761193a30a59"
+    "name": "dugite-native-v2.45.1-e87d290-windows-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-windows-x86.tar.gz",
+    "checksum": "99dafc60fdeb646988c7d6f54c74a557f877b28624ed82e4201460b7d2394d49"
   },
   "darwin-x64": {
-    "name": "dugite-native-v2.43.4-1074931-macOS-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-macOS-x64.tar.gz",
-    "checksum": "a7e2e4009ad119869792131b54475d3691b11a9ca2e66222be8232a9f7e323ab"
+    "name": "dugite-native-v2.45.1-e87d290-macOS-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-macOS-x64.tar.gz",
+    "checksum": "2a3c0b52e98a8423fe54722dd4dce905fce2d1d3014452e26df01f84c5033c3f"
   },
   "darwin-arm64": {
-    "name": "dugite-native-v2.43.4-1074931-macOS-arm64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-macOS-arm64.tar.gz",
-    "checksum": "bc385fa42d5b01513b5c9da6ee04a4868f30b60a42bd144b5ab8b993780aef7f"
+    "name": "dugite-native-v2.45.1-e87d290-macOS-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-macOS-arm64.tar.gz",
+    "checksum": "453ea5c74da5bb75b0474b19e0269feb548eaf2d2449b3e74a84123ced415e4c"
   },
   "linux-x64": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-x64.tar.gz",
-    "checksum": "fbff97763ca9cedbf87a196015f4dbffaa102681fd25103f99c40a7d561b8338"
+    "name": "dugite-native-v2.45.1-e87d290-ubuntu-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-ubuntu-x64.tar.gz",
+    "checksum": "cdf8c4cdca273e015d95c15fcc99e2322a97316f77f0b958b6b86424ca2b12da"
   },
   "linux-ia32": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-x86.tar.gz",
-    "checksum": "458e00694dbc94a691e25c67546d93c5df58877c805d300a1d6c8ad440c56aaf"
+    "name": "dugite-native-v2.45.1-e87d290-ubuntu-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-ubuntu-x86.tar.gz",
+    "checksum": "8ef716da12f5c2ca03288a5ee10e6cdd5ad958a164b379a6aafa19ca7f4eb72c"
   },
   "linux-arm": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-arm.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-arm.tar.gz",
-    "checksum": "03e25333ce52cccf32e6b4335978f4cd53ada2ad06dd3b424132edd9f5668357"
+    "name": "dugite-native-v2.45.1-e87d290-ubuntu-arm.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-ubuntu-arm.tar.gz",
+    "checksum": "5b8d27f9eba833477f518377ba5339c690523cc218fb3b3189fa8cacb229493f"
   },
   "linux-arm64": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-arm64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-arm64.tar.gz",
-    "checksum": "1d71732200951803dd55d2b943b322d0cfab8c36a9ecd859d08f840daf95a270"
+    "name": "dugite-native-v2.45.1-e87d290-ubuntu-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.45.1/dugite-native-v2.45.1-e87d290-ubuntu-arm64.tar.gz",
+    "checksum": "21cec4d32ceec81efa146a40253a2f766a1d3b34a6e7c1fed1d87c7c553b3c99"
   }
 }
diff --git a/test/fast/gcm-test.ts b/test/fast/gcm-test.ts
@@ -0,0 +1,13 @@
+import { GitProcess } from '../../lib'
+import { gitCredentialManagerVersion } from '../helpers'
+
+describe('git-credential-manager', () => {
+  it('matches the expected version', async () => {
+    const result = await GitProcess.exec(
+      ['credential-manager', '--version'],
+      process.cwd()
+    )
+    expect(result.exitCode).toBe(0)
+    expect(result.stdout).toContain(gitCredentialManagerVersion)
+  })
+})
diff --git a/test/helpers.ts b/test/helpers.ts
@@ -1,9 +1,10 @@
 import { GitProcess, IGitResult, GitError } from '../lib'
 
 // NOTE: bump these versions to the latest stable releases
-export const gitVersion = '2.43.4'
-export const gitForWindowsVersion = '2.43.4.windows.1'
+export const gitVersion = '2.45.1'
+export const gitForWindowsVersion = '2.45.1.windows.1'
 export const gitLfsVersion = '3.5.1'
+export const gitCredentialManagerVersion = '2.5.0'
 
 const temp = require('temp').track()