From 22bb03a93da25b127006cc6518c0f75018866f68 Mon Sep 17 00:00:00 2001 From: Brett Langdon Date: Thu, 22 Aug 2024 15:51:00 -0400 Subject: [PATCH] ci: download all GitHub Actions artifacts (#10305) [backport 2.11] (#10340) Backport of #10305 to 2.11 Right now we download all artifacts from the GitHub Actions build job, but we don't save them to as GitLab artifact. This change ensures we include all artifacts. ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d57c959524a..59b6a18a6d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: variables: REPO_LANG: python # "python" is used everywhere rather than "py" -download_ddtrace_wheels: +download_ddtrace_artifacts: image: registry.ddbuild.io/github-cli:v27480869-eafb11d-2.43.0 tags: [ "arch:amd64" ] stage: package @@ -28,12 +28,13 @@ download_ddtrace_wheels: artifacts: paths: - "pywheels/*.whl" + - "pywheels/*.tar.gz" download_dependency_wheels: image: registry.ddbuild.io/images/mirror/python:$PYTHON_IMAGE_TAG tags: [ "arch:amd64" ] stage: package - needs: [ download_ddtrace_wheels ] + needs: [ download_ddtrace_artifacts ] parallel: matrix: # The image tags that are mirrored are in: https://github.com/DataDog/images/blob/master/mirror.yaml - PYTHON_IMAGE_TAG: "3.7" @@ -55,7 +56,7 @@ download_dependency_wheels: - "pywheels-dep/" package-oci: - needs: [ download_dependency_wheels, download_ddtrace_wheels ] + needs: [ download_dependency_wheels, download_ddtrace_artifacts ] onboarding_tests_installer: parallel: