Size reports: Fix parent SHA race

#### Problem For a GitHub PR, the actual parent may be different from the commit given by `github.event.pull_request.base.sha` (see actions/checkout#27). In this case, size reports incorrectly include changes from commit(s) between the purported and actual parent. #### Change overview Extract the actual parent from the PR merge commit subject. #### Testing Manually checked externally https://github.com/kpschoedel/actiontest/runs/4226639507 Actual confirmation can only happen on live CI runs.
kpschoedel · Nov 16, 2021 · c61e299 · c61e299
1 parent e755a26
commit c61e299
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 9 deletions.
diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -32,7 +32,7 @@ jobs:
             BUILD_TYPE: gn_efr32
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -82,6 +82,16 @@ jobs:
                   scripts/examples/gn_efr32_example.sh examples/window-app/efr32/ out/window_app_debug BRD4161A
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A window-app \
                     out/window_app_debug/BRD4161A/chip-efr32-window-example.out /tmp/bloat_reports/
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -32,7 +32,7 @@ jobs:
             BUILD_TYPE: esp32
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -103,6 +103,16 @@ jobs:
             - name: Build example IPv6 Only App
               timeout-minutes: 10
               run: scripts/examples/esp_example.sh ipv6only-app sdkconfig.defaults
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -31,7 +31,7 @@ jobs:
         env:
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -71,6 +71,16 @@ jobs:
                 .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     p6 default all-clusters-app \
                     out/infineon-p6-all-clusters/chip-p6-clusters-example.out
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -31,7 +31,7 @@ jobs:
             BUILD_TYPE: gn_k32w
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -83,6 +83,16 @@ jobs:
                     k32w k32w061+se05x+release lighting-app \
                     out/lighting_app_se_release/chip-k32w061-light-example \
                     /tmp/bloat_reports/
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -31,7 +31,7 @@ jobs:
             BUILD_TYPE: gn_linux
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -123,6 +123,16 @@ jobs:
                     linux debug ota-requestor-app \
                     out/ota_requestor_debug/chip-ota-requestor-app \
                     /tmp/bloat_reports/
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -34,7 +34,7 @@ jobs:
             APP_TARGET: CY8CPROTO_062_4343W
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -112,6 +112,15 @@ jobs:
               timeout-minutes: 10
               run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
 
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -31,7 +31,7 @@ jobs:
             BUILD_TYPE: nrfconnect
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -144,6 +144,16 @@ jobs:
               timeout-minutes: 10
               run: |
                   scripts/run_in_build_env.sh "scripts/tests/nrfconnect_native_posix_tests.sh native_posix_64"
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -31,7 +31,7 @@ jobs:
             BUILD_TYPE: gn_qpg
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -85,6 +85,16 @@ jobs:
               timeout-minutes: 5
               run: |
                   config/qpg/chip-gn/build.sh
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -29,7 +29,7 @@ jobs:
             BUILD_TYPE: telink
             GH_EVENT_PR: ${{ github.event_name == 'pull_request' && github.event.number || 0 }}
             GH_EVENT_HASH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-            GH_EVENT_PARENT: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+            GH_EVENT_BASE: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
 
         runs-on: ubuntu-latest
         if: github.actor != 'restyled-io[bot]'
@@ -52,6 +52,16 @@ jobs:
                   telink tlsr9518adk80d lighting-app \
                   out/telink-tlsr9518adk80d-light/zephyr/zephyr.elf \
                   /tmp/bloat_reports/
+
+            - name: Get parent for size reports
+              run: |
+                MERGE_PARENT="$(git --no-pager log -1 --pretty=tformat:%s | sed -n -e 's/Merge [0-9a-f]\+ into //p')"
+                if [[ -z "${MERGE_PARENT}" || "${GH_EVENT_PR}" == 0 ]]
+                then
+                  MERGE_PARENT=$GH_EVENT_BASE
+                fi
+                echo "GH_EVENT_PARENT=$MERGE_PARENT" >>$GITHUB_ENV
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}