From cab7bd1b01b2015e958fa9e5b811f381aa8cd71e Mon Sep 17 00:00:00 2001
From: Daniel Chao <dan.chao@apple.com>
Date: Sat, 15 Nov 2025 16:30:51 -0800
Subject: [PATCH] Fix deploy jobs (#1319)

Specify `merge-multiple` to prevent new directories from being created
when downloading artifacts.
---
 .github/jobs/DeployJob.pkl     | 1 +
 .github/jobs/GithubRelease.pkl | 1 +
 .github/workflows/main.yml     | 1 +
 .github/workflows/release.yml  | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/.github/jobs/DeployJob.pkl b/.github/jobs/DeployJob.pkl
index daafb235..2db12c9a 100644
--- a/.github/jobs/DeployJob.pkl
+++ b/.github/jobs/DeployJob.pkl
@@ -18,6 +18,7 @@ steps {
   new Artifact.Download {
     with {
       pattern = "executable-**"
+      `merge-multiple` = true
     }
   }
   new Workflow.Step {
diff --git a/.github/jobs/GithubRelease.pkl b/.github/jobs/GithubRelease.pkl
index dead6759..56a47683 100644
--- a/.github/jobs/GithubRelease.pkl
+++ b/.github/jobs/GithubRelease.pkl
@@ -15,6 +15,7 @@ fixed job {
     new Artifact.Download {
       with {
         pattern = "executable-**"
+        `merge-multiple` = true
       }
     }
     new {
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9c15a604..380e3836 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -682,6 +682,7 @@ jobs:
     - uses: actions/download-artifact@v6
       with:
         pattern: executable-**
+        merge-multiple: true
     - env:
         ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEYID }}
         ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad1de538..bf108f80 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -682,6 +682,7 @@ jobs:
     - uses: actions/download-artifact@v6
       with:
         pattern: executable-**
+        merge-multiple: true
     - env:
         ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEYID }}
         ORG_GRADLE_PROJECT_signingKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGKEY }}
@@ -711,6 +712,7 @@ jobs:
     - uses: actions/download-artifact@v6
       with:
         pattern: executable-**
+        merge-multiple: true
     - name: Publish release on GitHub
       env:
         GH_TOKEN: ${{ github.token }}