Skip to content

Commit 2d38730

Browse files
committed
create-sdk-artifact: switch from bitness to architecture
As we're moving away from bitness in favor of architecture, let's update the logic in setup-git-for-windows-sdk as well. This also adds support for aarch64 in create-sdk-artifact, which we couldn't do with bitness. Signed-off-by: Dennis Ameling <[email protected]>
1 parent 880a1e9 commit 2d38730

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/git.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ const GIT_CONFIG_PARAMETERS = `'checkout.workers=56'`
2828
export function getArtifactMetadata(
2929
flavor: string,
3030
architecture: string
31-
): {bitness: string; repo: string; artifactName: string} {
32-
const bitness = architecture === 'i686' ? '32' : '64'
31+
): {repo: string; artifactName: string} {
3332
const repo = {
3433
i686: 'git-sdk-32',
3534
x86_64: 'git-sdk-64',
@@ -42,7 +41,7 @@ export function getArtifactMetadata(
4241

4342
const artifactName = `${repo}-${flavor}`
4443

45-
return {bitness, repo, artifactName}
44+
return {repo, artifactName}
4645
}
4746

4847
async function clone(
@@ -95,10 +94,7 @@ export async function getViaGit(
9594
}> {
9695
const owner = 'git-for-windows'
9796

98-
const {bitness, repo, artifactName} = getArtifactMetadata(
99-
flavor,
100-
architecture
101-
)
97+
const {repo, artifactName} = getArtifactMetadata(flavor, architecture)
10298

10399
const octokit = githubToken ? new Octokit({auth: githubToken}) : new Octokit()
104100
let head_sha: string
@@ -167,7 +163,7 @@ export async function getViaGit(
167163
...traceArg,
168164
'.tmp/build-extra/please.sh',
169165
'create-sdk-artifact',
170-
`--bitness=${bitness}`,
166+
`--architecture=${architecture}`,
171167
`--out=${outputDirectory}`,
172168
'--sdk=.tmp',
173169
flavor

0 commit comments

Comments
 (0)