Skip to content

Commit 7ab0351

Browse files
authored
Merge pull request #183 from brycehutchings/bryceh_fix_pipeline
Fix pipeline
2 parents 9984e3d + 079a103 commit 7ab0351

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.azure-pipelines/build_jobs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ jobs:
8989
- job: combine_artifacts
9090
dependsOn: windows_build
9191
displayName: "Organize artifacts"
92-
# Only build this if we're succeeding and we're on the master branch
93-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
9492
pool:
9593
vmImage: 'windows-latest'
9694
steps:

.azure-pipelines/organize_windows_artifacts.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ def move(src, dest):
2626
include_copied = False
2727

2828
for platform, uwp in product(PLATFORMS, TRUE_FALSE):
29+
# ARM/ARM64 is only built for the UWP platform.
30+
if not uwp and (platform.lower() == 'arm' or platform.lower() == 'arm64'):
31+
continue
32+
2933
base = outbase / '{}{}'.format(platform,
3034
'_uwp' if uwp else '')
3135
base.mkdir(parents=True, exist_ok=True)

0 commit comments

Comments
 (0)