[pull] master from DataDog:master

.github/workflows/measure-disk-usage-master.yml

@@ -0,0 +1,59 @@
+name: Measure Disk Usage (Master)
+run-name: "Measure Disk Usage (Master) [${{ github.sha }}]"
+
+# Temporary crutch: emits master disk-usage telemetry on .deps/ changes.
+# The main measure-disk-usage.yml workflow subscribes to resolve-build-deps via
+# workflow_run, but resolve-build-deps no longer runs on master pushes. This
+# workflow restores the master telemetry path until measure-disk-usage.yml is
+# reworked to subscribe to .deps/ changes directly.
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - .deps/**
+
+env:
+  PYTHON_VERSION: "3.13"
+
+jobs:
+  measure-disk-usage:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      actions: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python ${{ env.PYTHON_VERSION }}
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Get Datadog credentials
+        id: dd-sts
+        uses: DataDog/dd-sts-action@2e8187910199bd93129520183c093e19aa585c75 # v1.0.0
+        with:
+          policy: integrations-core-api-key
+
+      - name: Install ddev
+        run: |
+          pip install -e ./datadog_checks_dev[cli]
+          pip install -e ./ddev
+
+      - name: Configure ddev
+        run: ddev config override
+
+      - name: Measure disk usage (Uncompressed)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ddev -v size status --commit "${{ github.sha }}" --format json --to-dd-key ${{ steps.dd-sts.outputs.api_key }}
+
+      - name: Measure disk usage (Compressed)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ddev -v size status --commit "${{ github.sha }}" --format json --to-dd-key ${{ steps.dd-sts.outputs.api_key }} --compressed

.github/workflows/measure-disk-usage.yml

@@ -8,6 +8,7 @@ on:
       - completed
 env:
   PYTHON_VERSION: "3.13"
+  INTEGRATIONS_WHEELS_STORAGE: "stable"
 
 jobs:
 

.github/workflows/resolve-build-deps.yaml

@@ -1,20 +1,18 @@
 name: Resolve Dependencies and Build Wheels
 
 on:
-  workflow_dispatch:
   pull_request:
     branches:
     - master
     - 7.*.*
-
-  push:
-    branches:
-    - master
-    - 7.*.*
+    paths:
+    - agent_requirements.in
+    - .builders/**
+    - .github/workflows/resolve-build-deps.yaml
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' && true || false }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
 
 defaults:
   run:
@@ -28,58 +26,9 @@ env:
   SOURCE_DATE_EPOCH: "1580601600"
 
 jobs:
-  # measure-disk-usage.yml depends on this workflow being triggered and completed,
-  # so it can wait for the build to calculate dependency sizes.
-  # The 'on' setting ensures it runs, but this job cancels it if no dependency changes are detected.
-
-  check-should-run:
-    name: Check if build should run
-    runs-on: ubuntu-22.04
-    permissions:
-      actions: write
-      contents: read
-    outputs:
-      builder_changed: ${{ steps.dependency-check.outputs.builder_changed }}
-      should_run_build: ${{ steps.dependency-check.outputs.should_run_build }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Define diff commits
-        id: set_sha
-        if: github.event_name != 'workflow_dispatch'
-        run: .github/workflows/scripts/resolve_deps_define_diff_commits.sh
-        env:
-          PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-          EVENT_BEFORE: ${{ github.event.before }}
-
-      - name: Get changed files
-        id: changed-files
-        if: github.event_name != 'workflow_dispatch'
-        run: |
-          REPO="${{ github.repository }}"
-
-          CHANGED_FILES=$(gh api "repos/$REPO/compare/${{ steps.set_sha.outputs.prev_sha }}...${{ steps.set_sha.outputs.curr_sha }}" --paginate | \
-          jq -r 'select(.files != null) | .files | map(.filename) | join(" ")')
-
-          echo "files_changed=$CHANGED_FILES" >> $GITHUB_OUTPUT
-          echo "files_changed=$CHANGED_FILES"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Check if build should run
-        id: dependency-check
-        run: .github/workflows/scripts/resolve_deps_check_should_run.sh
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          FILES_CHANGED: ${{ steps.changed-files.outputs.files_changed }}
-
   test:
     name: Run tests
-    needs:
-      - check-should-run
-    if: needs.check-should-run.outputs.should_run_build == 'true'
+    if: github.event.pull_request.head.repo.fork == false
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
@@ -107,9 +56,7 @@ jobs:
   pre-resolve:
     name: Pre-resolve dependency versions
     needs:
-      - check-should-run
       - test
-    if: needs.check-should-run.outputs.should_run_build == 'true'
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
@@ -147,9 +94,7 @@ jobs:
   build:
     name: Target ${{ matrix.job.image }} on ${{ matrix.job.os }}
     needs:
-      - check-should-run
       - pre-resolve
-    if: needs.check-should-run.outputs.should_run_build == 'true'
     runs-on: ${{ matrix.job.os }}
     strategy:
       fail-fast: false
@@ -173,6 +118,17 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      with:
+        fetch-depth: 0
+
+    - name: Detect builder changes
+      id: builder-check
+      run: |
+        if git diff --quiet "origin/${{ github.base_ref }}...HEAD" -- .builders/; then
+          echo "builder_changed=false" >> "$GITHUB_OUTPUT"
+        else
+          echo "builder_changed=true" >> "$GITHUB_OUTPUT"
+        fi
 
     - name: Set up Python ${{ env.PYTHON_VERSION }}
       uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -199,28 +155,28 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build image and wheels
-      if: needs.check-should-run.outputs.builder_changed == 'true'
+      if: steps.builder-check.outputs.builder_changed == 'true'
       run: python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3 --constraints .constraints/constraints.txt
 
     - name: Pull image and build wheels
-      if: needs.check-should-run.outputs.builder_changed == 'false'
+      if: steps.builder-check.outputs.builder_changed == 'false'
       run: |
         digest=$(jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json)
         python .builders/build.py ${{ matrix.job.image }} --python 3 ${{ env.OUT_DIR }}/py3 --digest $digest --constraints .constraints/constraints.txt
 
     - name: Publish image
-      if: needs.check-should-run.outputs.builder_changed == 'true'
+      if: steps.builder-check.outputs.builder_changed == 'true'
       run: ${DOCKER} push ${{ env.BUILDER_IMAGE }}
 
     - name: Save new image digest
-      if: needs.check-should-run.outputs.builder_changed == 'true'
+      if: steps.builder-check.outputs.builder_changed == 'true'
       run: >-
         ${DOCKER} inspect --format "{{index .RepoDigests 0}}" ${{ env.BUILDER_IMAGE }}
         | cut -d '@' -f 2
         > ${{ env.OUT_DIR }}/image_digest
 
     - name: Persist current image digest
-      if: needs.check-should-run.outputs.builder_changed == 'false'
+      if: steps.builder-check.outputs.builder_changed == 'false'
       run: >-
         jq -r '.["${{ matrix.job.image }}"]' .deps/image_digests.json
         > ${{ env.OUT_DIR }}/image_digest
@@ -234,9 +190,7 @@ jobs:
   build-macos:
     name: Target macOS/${{ matrix.job.arch }} on ${{ matrix.job.os }}
     needs:
-      - check-should-run
       - pre-resolve
-    if: needs.check-should-run.outputs.should_run_build == 'true'
     runs-on: ${{ matrix.job.os }}
     strategy:
       fail-fast: false
@@ -323,11 +277,9 @@ jobs:
 
   publish:
     name: Publish artifacts and commit lockfiles to branch
-    if: needs.check-should-run.outputs.should_run_build == 'true' && github.event_name == 'pull_request' && !github.event.pull_request.head.repo.fork
     needs:
     - build
     - build-macos
-    - check-should-run
     runs-on: ubuntu-latest
 
     permissions:

ddev/changelog.d/23063.added

@@ -1 +1,2 @@
-Support size computation for lockfiles in both new and old formats.
+- Support size computation for lockfiles in both new and old formats. New CLI param (and envvar) to switch between storage locations.
+- Command to trigger the promotion of wheels for PRs that bump dependencies.

ddev/src/ddev/cli/size/diff.py

@@ -49,6 +49,7 @@ def diff(
     compressed: bool,
     format: list[str],
     show_gui: bool,
+    wheels_storage: str,
 ) -> None:
     """
     Compare the size of integrations and dependencies between two commits.
@@ -107,6 +108,7 @@ def diff(
                         "compressed": compressed,
                         "format": format,
                         "show_gui": show_gui,
+                        "wheels_storage": wheels_storage,
                     }
                     modules_plat_ver.extend(
                         diff_mode(
@@ -133,7 +135,14 @@ def diff_mode(
     progress: Progress,
 ) -> list[FileDataEntryPlatformVersion]:
     files_b, dependencies_b, files_a, dependencies_a = get_repo_info(
-        gitRepo, params["platform"], params["version"], first_commit, second_commit, params["compressed"], progress
+        gitRepo,
+        params["platform"],
+        params["version"],
+        first_commit,
+        second_commit,
+        params["compressed"],
+        params["wheels_storage"],
+        progress,
     )
 
     integrations = get_diff(files_b, files_a, "Integration")
@@ -178,6 +187,7 @@ def get_repo_info(
     first_commit: str,
     second_commit: str,
     compressed: bool,
+    wheels_storage: str,
     progress: Progress,
 ) -> tuple[list[FileDataEntry], list[FileDataEntry], list[FileDataEntry], list[FileDataEntry]]:
     with progress:
@@ -205,13 +215,13 @@ def get_repo_info(
         task = progress.add_task("[cyan]Calculating sizes for the first commit...", total=None)
         gitRepo.checkout_commit(first_commit)
         files_b = get_files(repo, compressed, version)
-        dependencies_b = get_dependencies(repo, platform, version, compressed)
+        dependencies_b = get_dependencies(repo, platform, version, compressed, wheels_storage)
         progress.remove_task(task)
 
         task = progress.add_task("[cyan]Calculating sizes for the second commit...", total=None)
         gitRepo.checkout_commit(second_commit)
         files_a = get_files(repo, compressed, version)
-        dependencies_a = get_dependencies(repo, platform, version, compressed)
+        dependencies_a = get_dependencies(repo, platform, version, compressed, wheels_storage)
         progress.remove_task(task)
 
     return files_b, dependencies_b, files_a, dependencies_a

ddev/src/ddev/cli/size/status.py

@@ -35,6 +35,7 @@ def status(
     compressed: bool,
     format: list[str],
     show_gui: bool,
+    wheels_storage: str,
     to_dd_org: str | None,
     to_dd_key: str | None,
     dependency_sizes: Path | None,
@@ -91,6 +92,7 @@ def status(
                 "compressed": compressed,
                 "format": format,
                 "show_gui": show_gui,
+                "wheels_storage": wheels_storage,
             }
             modules_plat_ver.extend(
                 status_mode(
@@ -179,7 +181,7 @@ def status_mode(
                 f"Getting dependencies from lockfiles for {params['platform']} {params['version']}"
             )
             modules = get_files(repo_path, params["compressed"], params["version"]) + get_dependencies(
-                repo_path, params["platform"], params["version"], params["compressed"]
+                repo_path, params["platform"], params["version"], params["compressed"], params["wheels_storage"]
             )
 
     formatted_modules = format_modules(modules, params["platform"], params["version"])