From 1db564670ef9c0cac7b273b99b929c2e48183615 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 7 Jul 2023 17:37:56 +0200 Subject: [PATCH 1/5] Revert "Merge pull request #540 from desktop/releases/v2.5.0" This reverts commit af8fbc31ab15f80a4cb9bdf610b38c4295b822d0, reversing changes made to 6fd1619248e306ad97ed25f326ef87368dd20b62. --- package.json | 2 +- script/embedded-git.json | 30 +++++++++++++++--------------- script/update-embedded-git.js | 31 +++++++++++++++++++++++++++++-- test/helpers.ts | 4 ++-- 4 files changed, 47 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 124258bf..a2107a67 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "2.5.0", + "version": "2.4.0", "description": "Elegant bindings for Git", "main": "./build/lib/index.js", "typings": "./build/lib/index.d.ts", diff --git a/script/embedded-git.json b/script/embedded-git.json index 12bb7f26..1ebd7a38 100644 --- a/script/embedded-git.json +++ b/script/embedded-git.json @@ -1,27 +1,27 @@ { "win32-x64": { - "name": "dugite-native-v2.39.3-887e871-windows-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3/dugite-native-v2.39.3-887e871-windows-x64.tar.gz", - "checksum": "04fccfb4ed18e72b82bf7a4d5489b97a61d07b027e44ac20a4c00ac8e5c0fac3" + "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" }, "win32-ia32": { - "name": "dugite-native-v2.39.3-887e871-windows-x86.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3/dugite-native-v2.39.3-887e871-windows-x86.tar.gz", - "checksum": "850df5220f87f97653b2fb8efc4318b7c6eb9f4a2b46b6927eb13486838066a5" + "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" }, "darwin-x64": { - "name": "dugite-native-v2.39.3-887e871-macOS-x64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3/dugite-native-v2.39.3-887e871-macOS-x64.tar.gz", - "checksum": "7074046490e0788eafd647d79ea1118fd14632ef6008bbbb1183ec6952e18198" + "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" }, "darwin-arm64": { - "name": "dugite-native-v2.39.3-887e871-macOS-arm64.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3/dugite-native-v2.39.3-887e871-macOS-arm64.tar.gz", - "checksum": "9c043ae08a739b195a517952dfd53be6fa56c7db26dcb6cab0931f0a7c905b9b" + "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" }, "linux-x64": { - "name": "dugite-native-v2.39.3-887e871-ubuntu.tar.gz", - "url": "https://github.com/desktop/dugite-native/releases/download/v2.39.3/dugite-native-v2.39.3-887e871-ubuntu.tar.gz", - "checksum": "7a6c87e0010896c6580a09a973a3ba895ebbac4f980fbf57502615954e3cd24f" + "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" } } \ No newline at end of file diff --git a/script/update-embedded-git.js b/script/update-embedded-git.js index 989be15f..dd0056a3 100644 --- a/script/update-embedded-git.js +++ b/script/update-embedded-git.js @@ -13,7 +13,10 @@ get(`https://api.github.com/repos/desktop/dugite-native/releases/latest`).then( 'win32-ia32': await findWindows32BitRelease(assets), 'darwin-x64': await findMacOSx64BitRelease(assets), 'darwin-arm64': await findMacOSARM64BitRelease(assets), - 'linux-x64': await findLinux64BitRelease(assets) + 'linux-x64': await findLinux64BitRelease(assets), + 'linux-x86': await findLinux32BitRelease(assets), + 'linux-arm': await findLinuxARM32BitRelease(assets), + 'linux-arm64': await findLinuxARM64BitRelease(assets) } const fileContents = JSON.stringify(output, null, 2) @@ -67,13 +70,37 @@ function findMacOSARM64BitRelease(assets) { } function findLinux64BitRelease(assets) { - const asset = assets.find(a => a.name.endsWith('-ubuntu.tar.gz')) + const asset = assets.find(a => a.name.endsWith('-ubuntu-x64.tar.gz')) if (asset == null) { throw new Error('Could not find Linux 64-bit archive in latest release') } return getDetailsForAsset(assets, asset) } +function findLinux32BitRelease(assets) { + const asset = assets.find(a => a.name.endsWith('-ubuntu-x86.tar.gz')) + if (asset == null) { + throw new Error('Could not find Linux 32-bit archive in latest release') + } + return getDetailsForAsset(assets, asset) +} + +function findLinuxARM64BitRelease(assets) { + const asset = assets.find(a => a.name.endsWith('-ubuntu-arm64.tar.gz')) + if (asset == null) { + throw new Error('Could not find Linux 64-bit archive in latest release') + } + return getDetailsForAsset(assets, asset) +} + +function findLinuxARM32BitRelease(assets) { + const asset = assets.find(a => a.name.endsWith('-ubuntu-arm.tar.gz')) + if (asset == null) { + throw new Error('Could not find Linux 32-bit archive in latest release') + } + return getDetailsForAsset(assets, asset) +} + async function getDetailsForAsset(assets, currentAsset) { const { name } = currentAsset const url = currentAsset.browser_download_url diff --git a/test/helpers.ts b/test/helpers.ts index ad2307eb..cc9343bf 100644 --- a/test/helpers.ts +++ b/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.3' -export const gitForWindowsVersion = '2.39.3.windows.1' +export const gitVersion = '2.39.2' +export const gitForWindowsVersion = '2.39.2.windows.1' export const gitLfsVersion = '3.3.0' const temp = require('temp').track() From 921a2157529e5088832711f6f12f202179a2ff8c Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 7 Jul 2023 17:38:30 +0200 Subject: [PATCH 2/5] Update dugite-native to v2.39.3-1 --- script/embedded-git.json | 45 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/script/embedded-git.json b/script/embedded-git.json index 1ebd7a38..997bc6c5 100644 --- a/script/embedded-git.json +++ b/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-x86": { + "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" } } \ No newline at end of file From ad59cd25f56e3477bb63500a14c7fe283fdc4c69 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 7 Jul 2023 17:40:05 +0200 Subject: [PATCH 3/5] Fix test to expect the right git version 2.39.3(.windows.1) --- test/helpers.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/helpers.ts b/test/helpers.ts index cc9343bf..ad2307eb 100644 --- a/test/helpers.ts +++ b/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() From f58f794196664a474f55abd1d985d5bf3ad658dc Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 7 Jul 2023 17:41:59 +0200 Subject: [PATCH 4/5] Restore right version number v2.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2107a67..124258bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "2.4.0", + "version": "2.5.0", "description": "Elegant bindings for Git", "main": "./build/lib/index.js", "typings": "./build/lib/index.d.ts", From 5ae9c4ba1231152650bde92ae2657563f8a31122 Mon Sep 17 00:00:00 2001 From: Sergio Padrino Date: Fri, 7 Jul 2023 17:42:03 +0200 Subject: [PATCH 5/5] 2.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 124258bf..2bdeb012 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dugite", - "version": "2.5.0", + "version": "2.5.1", "description": "Elegant bindings for Git", "main": "./build/lib/index.js", "typings": "./build/lib/index.d.ts",