Skip to content

Switch from bitness to architecture #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 6, 2023
Merged

Switch from bitness to architecture #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9b6228
create-sdk-artifact: switch from bitness to architecture
dennisameling Feb 4, 2023
1a6b81c
npm run build && npm run package
dennisameling Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions src/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ const GIT_CONFIG_PARAMETERS = `'checkout.workers=56'`
export function getArtifactMetadata(
flavor: string,
architecture: string
): {bitness: string; repo: string; artifactName: string} {
const bitness = architecture === 'i686' ? '32' : '64'
): {repo: string; artifactName: string} {
const repo = {
i686: 'git-sdk-32',
x86_64: 'git-sdk-64',
Expand All @@ -42,7 +41,7 @@ export function getArtifactMetadata(

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

return {bitness, repo, artifactName}
return {repo, artifactName}
}

async function clone(
Expand Down Expand Up @@ -95,10 +94,7 @@ export async function getViaGit(
}> {
const owner = 'git-for-windows'

const {bitness, repo, artifactName} = getArtifactMetadata(
flavor,
architecture
)
const {repo, artifactName} = getArtifactMetadata(flavor, architecture)

const octokit = githubToken ? new Octokit({auth: githubToken}) : new Octokit()
let head_sha: string
Expand Down Expand Up @@ -167,7 +163,7 @@ export async function getViaGit(
...traceArg,
'.tmp/build-extra/please.sh',
'create-sdk-artifact',
`--bitness=${bitness}`,
`--architecture=${architecture}`,
`--out=${outputDirectory}`,
'--sdk=.tmp',
flavor
Expand Down