Skip to content

Commit bfc3668

Browse files
committed
fix publish to s3 needs
1 parent 908e81f commit bfc3668

File tree

1 file changed

+50
-25
lines changed

1 file changed

+50
-25
lines changed

.gitlab/package.yml

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -170,31 +170,56 @@ publish-wheels-to-s3:
170170
tags: ["arch:amd64"]
171171
image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
172172
stage: package
173-
needs:
174-
# - job: download_ddtrace_artifacts
175-
# artifacts: true
176-
- job: "build linux"
177-
artifacts: true
178-
parallel:
179-
matrix:
180-
- IMAGE_ARCH: "x86_64"
181-
ARCH_TAG: "amd64"
182-
PYTHON_TAG: *PYTHON_TAGS
183-
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
184-
- IMAGE_ARCH: "aarch64"
185-
ARCH_TAG: "arm64"
186-
PYTHON_TAG: *PYTHON_TAGS
187-
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
188-
- job: "build macos"
189-
artifacts: true
190-
parallel:
191-
matrix:
192-
- IMAGE_ARCH: "x86_64"
193-
ARCH_TAG: "amd64"
194-
UV_PYTHON: *PYTHON_VERSIONS
195-
- IMAGE_ARCH: "aarch64"
196-
ARCH_TAG: "arm64"
197-
UV_PYTHON: *PYTHON_VERSIONS
173+
rules:
174+
# On PRs/feature branches: only depend on 3.14 macos builds
175+
- if: '($IS_MAIN_BRANCH == "false") && ($IS_RELEASE_BRANCH == "false") && ($IS_RELEASE == "false")'
176+
needs:
177+
- job: "build linux"
178+
artifacts: true
179+
parallel:
180+
matrix:
181+
- IMAGE_ARCH: "x86_64"
182+
ARCH_TAG: "amd64"
183+
PYTHON_TAG: *PYTHON_TAGS
184+
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
185+
- IMAGE_ARCH: "aarch64"
186+
ARCH_TAG: "arm64"
187+
PYTHON_TAG: *PYTHON_TAGS
188+
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
189+
- job: "build macos"
190+
artifacts: true
191+
parallel:
192+
matrix:
193+
- IMAGE_ARCH: "x86_64"
194+
ARCH_TAG: "amd64"
195+
UV_PYTHON: "3.14"
196+
- IMAGE_ARCH: "aarch64"
197+
ARCH_TAG: "arm64"
198+
UV_PYTHON: "3.14"
199+
# On main, release branches, and releases: depend on all macos builds
200+
- needs:
201+
- job: "build linux"
202+
artifacts: true
203+
parallel:
204+
matrix:
205+
- IMAGE_ARCH: "x86_64"
206+
ARCH_TAG: "amd64"
207+
PYTHON_TAG: *PYTHON_TAGS
208+
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
209+
- IMAGE_ARCH: "aarch64"
210+
ARCH_TAG: "arm64"
211+
PYTHON_TAG: *PYTHON_TAGS
212+
LINUX_OS_IMAGE: *LINUX_OS_IMAGES
213+
- job: "build macos"
214+
artifacts: true
215+
parallel:
216+
matrix:
217+
- IMAGE_ARCH: "x86_64"
218+
ARCH_TAG: "amd64"
219+
UV_PYTHON: *PYTHON_VERSIONS
220+
- IMAGE_ARCH: "aarch64"
221+
ARCH_TAG: "arm64"
222+
UV_PYTHON: *PYTHON_VERSIONS
198223
variables:
199224
BUCKET: dd-trace-py-builds
200225
script:

0 commit comments

Comments
 (0)