linux json

Author: lucia-sb

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

@@ -38,14 +38,10 @@ jobs:
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Testing dependency sizes
+    - name: Measure disk usage
       run: |
-        ddev size status --platform ${{ inputs.platform }} --dependency-sizes ${{ inputs.platform }}/py3/sizes.json > size-dependency-sizes.txt
-        ddev size status --platform ${{ inputs.platform }} --dependency-sizes ${{ inputs.platform }}/py3/sizes.json --format png,csv,markdown
-        cat size-dependency-sizes.txt
-        echo "# Size (dependency sizes)" >> $GITHUB_STEP_SUMMARY
-        cat size-dependency-sizes.txt >> $GITHUB_STEP_SUMMARY
-
+        ddev size status --platform ${{ inputs.platform }} --dependency-sizes ${{ inputs.platform }}/py3/sizes.json --format json
+        ddev size status --platform ${{ inputs.platform }} --compressed --dependency-sizes ${{ inputs.platform }}/py3/sizes.json --format json
     
     - name: Rename sizes.json to platform.json
       run: |
@@ -58,6 +54,21 @@ jobs:
         name: ${{ inputs.platform }}.json
         path: ${{ inputs.platform }}.json
         if-no-files-found: error
+    
+    - name: Upload JSON uncompressed sizes artifact
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: ${{ inputs.platform }}_uncompressed_status.json
+        path: ${{ inputs.platform }}_uncompressed_status.json
+        if-no-files-found: error
+        
+    - name: Upload JSON compressed sizes artifact
+      uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      with:
+        name: ${{ inputs.platform }}_compressed_status.json
+        path: ${{ inputs.platform }}_compressed_status.json
+        if-no-files-found: error
+    
 
     #   run: | 
     #     ddev size status --to-dd-key ${{secrets.DD_API_KEY}} > size-uncompressed.txt 

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

@@ -65,8 +65,8 @@ jobs:
           image: linux-aarch64
         - os: ubuntu-22.04
           image: linux-x86_64
-        # - os: windows-2022  # TODO: REMEMBER TO REENABLE THIS
-        #   image: windows-x86_64
+        - os: windows-2022 
+          image: windows-x86_64
 
     permissions:
       packages: write
@@ -170,11 +170,15 @@ jobs:
       with:
         name: target-${{ matrix.job.image }}
         path: output
+
   measure-disk-usage:
     needs: build
+    strategy:
+      matrix:
+        platform: [linux-x86_64, linux-aarch64, windows-x86_64]
     uses: DataDog/integrations-core/.github/workflows/measure-disk-usage.yml@lucia-sb/calculate-dep-sizes
     with:
-      platform: ${{ matrix.job.image }}
+      platform: ${{ matrix.platform }}
       run-id: ${{ github.run_id }}
 
   build-macos:
@@ -249,18 +253,16 @@ jobs:
       with:
         name: target-macos-${{ matrix.job.arch }}
         path: output
+        
 # ----------- CHANGE TO MASTER BRANCH ------------
-  measure-disk-usage-x86_64:
-    needs: build-macos
-    uses: DataDog/integrations-core/.github/workflows/measure-disk-usage.yml@lucia-sb/calculate-dep-sizes
-    with:
-      platform: macos-x86_64
-      run-id: ${{ github.run_id }}
-  measure-disk-usage-aarch64:
+  measure-disk-usage:
     needs: build-macos
+    strategy:
+      matrix:
+        platform: [macos-x86_64, macos-aarch64]
     uses: DataDog/integrations-core/.github/workflows/measure-disk-usage.yml@lucia-sb/calculate-dep-sizes
     with:
-      platform: macos-aarch64
+      platform: ${{ matrix.platform }}
       run-id: ${{ github.run_id }}