Skip to content

Commit 152876b

Browse files
authored
Code update for arch 'ia32' on windows arm64 and package.json version to current sprint (#284)
* Update package.json version to current sprint * Update package-lock.json * Update azure-pipeline.yml Added skipBuildTagsForGitHubPullRequests: true in yml * Code changes related to ia32 on win arm64 Code changes related to ia32 on windows arm64 * code update * Code format update
1 parent ddf4a55 commit 152876b

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ trigger:
44
- main
55
- releases/*
66
variables:
7+
- name: skipBuildTagsForGitHubPullRequests
8+
value: true
79
- group: npm-tokens
810
resources:
911
repositories:

common-npm-packages/packaging-common/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common-npm-packages/packaging-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "azure-pipelines-tasks-packaging-common",
3-
"version": "3.235.0",
3+
"version": "3.236.0",
44
"description": "Azure Pipelines Packaging Tasks Common",
55
"scripts": {
66
"test": "mocha _build/Tests/L0.js",

common-npm-packages/packaging-common/universal/ArtifactToolUtilities.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,13 @@ export async function getArtifactToolFromService(serviceUri: string, accessToken
5555

5656
// https://github.com/nodejs/node-v0.x-archive/issues/2862
5757
if (arch === "ia32") {
58-
if (process.env.PROCESSOR_ARCHITEW6432 != null && process.env.PROCESSOR_ARCHITEW6432.toUpperCase() === "AMD64") {
59-
arch = "amd64";
58+
if (process.env.PROCESSOR_ARCHITEW6432 != null) {
59+
if (process.env.PROCESSOR_ARCHITEW6432.toUpperCase() === "AMD64") {
60+
arch = "amd64";
61+
}
62+
else if (process.env.PROCESSOR_ARCHITEW6432.toUpperCase() == "ARM64") {
63+
arch = "arm64";
64+
}
6065
}
6166
else if (process.env.PROCESSOR_ARCHITEW6432 == null && process.arch.toUpperCase() === "ARM64") {
6267
arch = "arm64";

common-npm-packages/packaging-common/universal/ClientToolUtilities.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ export function getSupportedArchitecture(): string {
6262

6363
// https://github.com/nodejs/node-v0.x-archive/issues/2862
6464
if (architecture == "ia32") {
65-
if (process.env.PROCESSOR_ARCHITEW6432 != null && process.env.PROCESSOR_ARCHITEW6432.toUpperCase() === "AMD64") {
66-
architecture = "amd64";
65+
if (process.env.PROCESSOR_ARCHITEW6432 != null) {
66+
if (process.env.PROCESSOR_ARCHITEW6432.toUpperCase() === "AMD64") {
67+
architecture = "amd64";
68+
}
69+
else if (process.env.PROCESSOR_ARCHITEW6432.toUpperCase() == "ARM64") {
70+
architecture = "arm64";
71+
}
6772
}
68-
else if (process.env.PROCESSOR_ARCHITEW6432 == null && process.arch.toUpperCase() === "ARM64") {
73+
else if (process.env.PROCESSOR_ARCHITEW6432 == null && process.arch.toUpperCase() === "ARM64") {
6974
architecture = "arm64";
7075
}
7176
}

0 commit comments

Comments
 (0)