Skip to content

Commit 1247ac2

Browse files
erikayasudaYun-Kimncybulnsrip-ddwconti27
authored
chore: update 3.x-staging with main (#12244)
This is to ensure no commits on `main` get erased when we force-push `3.x-staging` into `main`. This is to cover the one commit that slipped: #12036 After this is merged, `3.x-staging` should be ready to be merged into `main` safely for dd-trace-py to upgrade to 3.x ## 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) --------- Co-authored-by: Yun Kim <[email protected]> Co-authored-by: Nicole Cybul <[email protected]> Co-authored-by: Nick Ripley <[email protected]> Co-authored-by: William Conti <[email protected]> Co-authored-by: Christophe Papazian <[email protected]> Co-authored-by: Munir Abdinur <[email protected]> Co-authored-by: Laplie Anderson <[email protected]> Co-authored-by: Brett Langdon <[email protected]>
1 parent 9ba79f4 commit 1247ac2

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Diff for: .gitlab/prepare-oci-package.sh

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
22
set -eo pipefail
33

4+
if [ "$OS" != "linux" ]; then
5+
echo "Only linux packages are supported. Exiting"
6+
exit 0
7+
fi
8+
49
if [ -n "$CI_COMMIT_TAG" ] && [ -z "$PYTHON_PACKAGE_VERSION" ]; then
510
PYTHON_PACKAGE_VERSION=${CI_COMMIT_TAG##v}
611
fi

0 commit comments

Comments
 (0)