From b3fdc3f85646b5ab47c4945938cf90c25b711ad9 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 7 Jan 2026 08:50:18 -0500 Subject: [PATCH 1/4] ci: fix broken dd-trace-py wheel downloading --- .github/workflows/build_layer.yml | 54 +++++-------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml index fc22e9ce..9e6a9db2 100644 --- a/.github/workflows/build_layer.yml +++ b/.github/workflows/build_layer.yml @@ -8,32 +8,9 @@ on: - "main" jobs: - get-ddtrace-run-id: - runs-on: ubuntu-latest - outputs: - run-id: ${{ steps.get-ddtrace-run-id.outputs.run_id }} - steps: - - name: Resolve Run ID of latest dd-trace-py build - id: get-ddtrace-run-id - env: - GH_TOKEN: ${{ github.token }} - run: | - RUN_ID=$(gh run list \ - --repo DataDog/dd-trace-py \ - --workflow build_deploy.yml \ - --branch main \ - --status success \ - --limit 1 \ - --json databaseId \ - --jq '.[0].databaseId') - - echo "run_id=$RUN_ID" >> $GITHUB_OUTPUT - build: runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }} - needs: get-ddtrace-run-id - strategy: fail-fast: false matrix: @@ -44,33 +21,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Build artifact name - id: build-artifact-name + - name: Download ddtrace Wheel + id: find-ddtrace-wheel run: | - if [ "${{ matrix.arch }}" == "amd64" ]; then - ARCH="x86_64" + # Convert matrix.arch into pip platform tag + if [ "${{ matrix.arch }}" = "amd64" ]; then + PLATFORM_TAG="manylinux_2014_x86_64" else - ARCH="aarch64" + PLATFORM_TAG="manylinux_2014_aarch64" fi - VER="${{ matrix.python_version }}" - PY_VERSION_NO_DOT="${VER//./}" - - echo "artifact_name=wheels-cp${PY_VERSION_NO_DOT}-manylinux_${ARCH}" >> $GITHUB_OUTPUT - - - name: Download ddtrace Wheel - uses: actions/download-artifact@v4 - with: - name: ${{ steps.build-artifact-name.outputs.artifact_name }} - repository: DataDog/dd-trace-py - run-id: ${{ needs.get-ddtrace-run-id.outputs.run-id }} - github-token: ${{ secrets.GITHUB_TOKEN }} - path: ./artifacts - - - name: Find ddtrace Wheel - id: find-ddtrace-wheel - run: | - echo "wheel_path=$(find ./artifacts -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT + pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace + echo "wheel_path=$(find . -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT - name: Patch pyproject.toml run: | From 291174d9d513d9debd940090421a654b6d01e548 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 7 Jan 2026 08:53:40 -0500 Subject: [PATCH 2/4] debug --- .github/workflows/build_layer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml index 9e6a9db2..807f30a3 100644 --- a/.github/workflows/build_layer.yml +++ b/.github/workflows/build_layer.yml @@ -31,6 +31,7 @@ jobs: PLATFORM_TAG="manylinux_2014_aarch64" fi + echo pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace echo "wheel_path=$(find . -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT From e8d9c9c3995df5d8265a9692ff975198a98405fc Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 7 Jan 2026 08:55:47 -0500 Subject: [PATCH 3/4] fix platform tag --- .github/workflows/build_layer.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml index 807f30a3..c4b3525f 100644 --- a/.github/workflows/build_layer.yml +++ b/.github/workflows/build_layer.yml @@ -26,12 +26,11 @@ jobs: run: | # Convert matrix.arch into pip platform tag if [ "${{ matrix.arch }}" = "amd64" ]; then - PLATFORM_TAG="manylinux_2014_x86_64" + PLATFORM_TAG="manylinux_2_17_x86_64" else - PLATFORM_TAG="manylinux_2014_aarch64" + PLATFORM_TAG="manylinux_2_17_aarch64" fi - echo pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace echo "wheel_path=$(find . -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT From bed49280bd1faf6debcc11fbab2aa133f1f57dd2 Mon Sep 17 00:00:00 2001 From: brettlangdon Date: Wed, 7 Jan 2026 10:10:50 -0500 Subject: [PATCH 4/4] add necessary --no-index --- .github/workflows/build_layer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_layer.yml b/.github/workflows/build_layer.yml index c4b3525f..1725975f 100644 --- a/.github/workflows/build_layer.yml +++ b/.github/workflows/build_layer.yml @@ -31,7 +31,7 @@ jobs: PLATFORM_TAG="manylinux_2_17_aarch64" fi - pip download --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace + pip download --no-index --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace echo "wheel_path=$(find . -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT - name: Patch pyproject.toml