Skip to content

Commit 9bd0017

Browse files
committed
Refactor the Linux stuff
1 parent 9a0a7db commit 9bd0017

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

.Pipelines/pipeline-publish.yml

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,38 +87,30 @@ extends:
8787
displayName: 'Build sdist + wheel (Python 3.12)'
8888
pool:
8989
type: linux
90-
isCustom: true
91-
vmImage: 'ubuntu-22.04'
9290
variables:
9391
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
92+
LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
9493
steps:
95-
- task: UsePythonVersion@0
96-
inputs:
97-
versionSpec: '3.12'
98-
displayName: 'Use Python 3.12'
94+
- script: |
95+
apt-get update && apt-get install -y python3 python3-pip python3-venv
96+
displayName: 'Install Python 3'
9997
10098
- script: |
101-
python -m pip install --upgrade pip build twine
99+
python3 -m pip install --upgrade pip build twine
102100
displayName: 'Install build toolchain'
103101
104102
- script: |
105-
python -m build
103+
python3 -m build
106104
displayName: 'Build sdist and wheel'
107105
108106
- script: |
109-
python -m twine check dist/*
107+
python3 -m twine check dist/*
110108
displayName: 'Verify distribution (twine check)'
111109
112110
- script: |
113111
cp -r dist/* $(ob_outputDirectory)/
114112
displayName: 'Copy dist to output directory'
115113
116-
- task: PublishPipelineArtifact@1
117-
displayName: 'Publish build artifacts'
118-
inputs:
119-
targetPath: '$(ob_outputDirectory)'
120-
artifactName: 'drop_Build_BuildDist'
121-
122114
# ========================================================================
123115
# Stage 5a - Publish to test.pypi.org (Preview / RC)
124116
# ========================================================================
@@ -144,7 +136,7 @@ extends:
144136
displayName: 'Download build artifact'
145137
inputs:
146138
buildType: 'current'
147-
artifactName: 'drop_Build_BuildDist'
139+
itemPattern: '**/drop_Build_BuildDist/*'
148140
targetPath: $(Pipeline.Workspace)/python-dist
149141

150142
- task: UsePythonVersion@0
@@ -221,7 +213,7 @@ extends:
221213
displayName: 'Download python-dist artifact'
222214
inputs:
223215
buildType: 'current'
224-
artifactName: 'drop_Build_BuildDist'
216+
itemPattern: '**/drop_Build_BuildDist/*'
225217
targetPath: $(Pipeline.Workspace)/python-dist
226218

227219
- task: EsrpRelease@12
@@ -235,7 +227,7 @@ extends:
235227
intent: 'PackageDistribution'
236228
contenttype: 'PyPi'
237229
contentsource: 'Folder'
238-
folderlocation: '$(Pipeline.Workspace)/python-dist'
230+
folderlocation: '$(Pipeline.Workspace)/python-dist/drop_Build_BuildDist'
239231
waitforreleasecompletion: true
240232
owners: 'ryauld@microsoft.com,avdunn@microsoft.com'
241233
approvers: 'avdunn@microsoft.com,bogavril@microsoft.com'

0 commit comments

Comments
 (0)