From 315901e8b7b3f41c965b6f765bbe747213beb8af Mon Sep 17 00:00:00 2001
From: Hao <131711973+haozheng-cobalt@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:14:56 -0700
Subject: [PATCH] Upload list of artifacts matched with a wildcard (#3937)

b/291954423
---
 .github/workflows/evergreen.yaml | 8 ++++----
 .github/workflows/main.yaml      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/evergreen.yaml b/.github/workflows/evergreen.yaml
index 888d955f234e..b9ca62af2a67 100644
--- a/.github/workflows/evergreen.yaml
+++ b/.github/workflows/evergreen.yaml
@@ -31,7 +31,7 @@ jobs:
       platform: evergreen-x64
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
-      keep_artifacts: libcobalt.so
+      keep_artifacts: libcobalt.*
   evergreen-arm-hardfp:
     uses: ./.github/workflows/main.yaml
     permissions:
@@ -41,7 +41,7 @@ jobs:
       platform: evergreen-arm-hardfp
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
-      keep_artifacts: libcobalt.so
+      keep_artifacts: libcobalt.*
   evergreen-arm-softfp:
     uses: ./.github/workflows/main.yaml
     permissions:
@@ -51,7 +51,7 @@ jobs:
       platform: evergreen-arm-softfp
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
-      keep_artifacts: libcobalt.so
+      keep_artifacts: libcobalt.*
   evergreen-arm64:
     uses: ./.github/workflows/main.yaml
     permissions:
@@ -61,4 +61,4 @@ jobs:
       platform: evergreen-arm64
       nightly: ${{ github.event.inputs.nightly }}
       run_api_leak_detector: true
-      keep_artifacts: libcobalt.so
+      keep_artifacts: libcobalt.*
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 10a4f58a959a..6f118069f965 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -259,10 +259,10 @@ jobs:
         uses: ./.github/actions/build
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v4
-        if: ${{ inputs.keep_artifacts && matrix.sb_api_version == '' }}
+        if: ${{ inputs.keep_artifacts }}
         with:
           name: ${{ matrix.platform }}-${{ matrix.config }}
-          path: out/${{ matrix.platform }}_${{ matrix.config }}/${{ inputs.keep_artifacts }}
+          path: out/${{ matrix.target_platform }}_${{ matrix.config }}/${{ inputs.keep_artifacts }}
           retention-days: 7
           compression-level: 0 # We expect kept artifacts to be already compressed
           if-no-files-found: error