Skip to content

Commit

Permalink
add ARM64 config (#1881)
Browse files Browse the repository at this point in the history
  • Loading branch information
tian-lt authored Aug 29, 2022
1 parent 303bd20 commit 3aa61fc
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
6 changes: 6 additions & 0 deletions build/pipelines/azure-pipelines.ci-internal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ jobs:
useReleaseAppxManifest: false
platform: ARM

- template: ./templates/build-single-architecture.yaml
parameters:
isReleaseBuild: true
useReleaseAppxManifest: false
platform: ARM64

- template: ./templates/run-ui-tests.yaml
parameters:
platform: x64
Expand Down
7 changes: 7 additions & 0 deletions build/pipelines/azure-pipelines.release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ jobs:
useReleaseAppxmanifest: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))

- template: ./templates/build-single-architecture.yaml
parameters:
platform: ARM64
isReleaseBuild: true
useReleaseAppxmanifest: true
condition: not(eq(variables['Build.Reason'], 'PullRequest'))

- template: ./templates/run-ui-tests.yaml
parameters:
platform: x64
Expand Down
2 changes: 1 addition & 1 deletion build/pipelines/templates/build-single-architecture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.103
vstsPackageVersion: 0.0.105

- task: NuGetToolInstaller@1
displayName: Use NuGet 6.x
Expand Down
6 changes: 4 additions & 2 deletions build/pipelines/templates/package-msixbundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ jobs:
- Buildx64
- Buildx86
- BuildARM
- BuildARM64
condition: |
and
(
in(dependencies.Buildx64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.Buildx86.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
in(dependencies.BuildARM.result, 'Succeeded', 'SucceededWithIssues', 'Skipped'),
in(dependencies.BuildARM64.result, 'Succeeded', 'SucceededWithIssues', 'Skipped')
)
pool:
${{ if eq(parameters.isOSSBuild, true) }}:
Expand Down Expand Up @@ -47,7 +49,7 @@ jobs:
downloadDirectory: $(Build.SourcesDirectory)
vstsFeed: WindowsInboxApps
vstsFeedPackage: calculator-internals
vstsPackageVersion: 0.0.103
vstsPackageVersion: 0.0.105

- task: PowerShell@2
displayName: Generate MsixBundle mapping
Expand Down

0 comments on commit 3aa61fc

Please sign in to comment.