From 4b76f7925a20de56babf4c14f32832c3f8a9fb46 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Fri, 20 Oct 2023 14:21:33 +0200
Subject: [PATCH] Last Bloaty fixes (#1787)

---
 .github/workflows/linux-ci.yml  | 4 ++--
 .github/workflows/pr-bloaty.yml | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index a038ce0c813..598d025002f 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -113,7 +113,7 @@ jobs:
             build-size/bin/mbgl-render
 
       - name: Configure AWS Credentials
-        if: github.ref == 'refs/heads/main' && vars.OIDC_AWS_ROLE_TO_ASSUME 
+        if: matrix.renderer == 'drawable' && github.ref == 'refs/heads/main' && vars.OIDC_AWS_ROLE_TO_ASSUME 
         uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: us-west-2
@@ -121,7 +121,7 @@ jobs:
           role-session-name: ${{ github.run_id }}
 
       - name: Upload mbgl-render to S3
-        if: github.ref == 'refs/heads/main' && vars.OIDC_AWS_ROLE_TO_ASSUME 
+        if: matrix.renderer == 'drawable' && github.ref == 'refs/heads/main' && vars.OIDC_AWS_ROLE_TO_ASSUME 
         run: aws s3 cp build-size/bin/mbgl-render s3://maplibre-native/mbgl-render-main
 
       # CodeQL
diff --git a/.github/workflows/pr-bloaty.yml b/.github/workflows/pr-bloaty.yml
index e659a0b7367..60df963d507 100644
--- a/.github/workflows/pr-bloaty.yml
+++ b/.github/workflows/pr-bloaty.yml
@@ -45,6 +45,7 @@ jobs:
           ninjaVersion: latest
 
       - name: Cache Bloaty
+        id: cache-bloaty
         uses: actions/cache@v3
         with:
           path: bloaty/build/bloaty
@@ -53,6 +54,7 @@ jobs:
       # because Google is not making a release...
       # https://github.com/google/bloaty/issues/334
       - name: Compile Bloaty
+        if: ${{ !steps.cache-bloaty.outputs.cache-hit }}
         run: |
           git clone https://github.com/google/bloaty.git
           cd bloaty
@@ -85,7 +87,7 @@ jobs:
             echo '```'
             awk 'NR <= 2; END { print }' tlus_diff_main.txt
             echo '```'
-            echo "Full report: $gist_url"
+            echo "Full report: $report_path"
           } >> message.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -95,7 +97,7 @@ jobs:
           report_path=bloaty-results/pr-${{ steps.get-pr-number.outputs.pr-number }}-compared-to-legacy.txt
           aws s3 cp tlus_diff_legacy.txt s3://maplibre-native/"$report_path"
           {
-            echo "Compared to $legacy_maplibre_sha"
+            echo "Compared to $legacy_maplibre_sha (legacy)"
             echo '```'
             awk 'NR <= 2; END { print }' tlus_diff_legacy.txt
             echo '```'