Last Bloaty fixes (#1787)

maplibre · Oct 20, 2023 · 4b76f79 · 4b76f79
1 parent e9efb28
commit 4b76f79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -113,15 +113,15 @@ 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
           role-to-assume: ${{ vars.OIDC_AWS_ROLE_TO_ASSUME }}
           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
@@ -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 '```'