From 6d0f41691326541f828562685af02acb1b4a9b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danny=20M=C3=B6sch?= <danny.moesch@icloud.com>
Date: Sat, 11 Jan 2025 17:30:42 +0100
Subject: [PATCH] Move files to the same level before upload

---
 .github/workflows/release.yml | 18 +++++++++---------
 Makefile                      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c714b193c..148a7e39d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -65,14 +65,14 @@ jobs:
           ref: ${{ inputs.branch }}
       - name: Build SwiftLint for macOS
         run: make bazel_release
-      - name: Upload binary as artifact
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: swiftlint
           path: |
-            ${{ env.MACOS_BUILD_DIR }}/swiftlint
-            bazel-bin/bazel.tar.gz
-            bazel-bin/bazel.tar.gz.sha256
+            swiftlint
+            bazel.tar.gz
+            bazel.tar.gz.sha256
           retention-days: 2
           if-no-files-found: error
   create-release:
@@ -95,21 +95,21 @@ jobs:
         with:
           name: swiftlint
           path: ${{ env.MACOS_BUILD_DIR }}
-      - name: Move Bazel release
-        run: mv -f ${{ env.MACOS_BUILD_DIR }}/bazel.tar.gz ${{ env.MACOS_BUILD_DIR }}/bazel.tar.gz.sha256 .
       - name: Download binary artifact for Linux
         uses: actions/download-artifact@v4
         with:
           name: swiftlint_linux_amd64
           path: ${{ env.LINUX_BUILD_DIR }}
-      - name: Make binaries executable
-        run: chmod +x ${{ env.MACOS_BUILD_DIR }}/swiftlint ${{ env.LINUX_BUILD_DIR }}/swiftlint_linux_amd64
       - name: List downloaded files
         if: always()
         run: |
           ls -al .build
-          ls -al ${{ env.MACOS_BUILD_DIR }}
           ls -al ${{ env.LINUX_BUILD_DIR }}
+          ls -al ${{ env.MACOS_BUILD_DIR }}
+      - name: Move Bazel release
+        run: mv -f ${{ env.MACOS_BUILD_DIR }}/bazel.tar.gz ${{ env.MACOS_BUILD_DIR }}/bazel.tar.gz.sha256 .
+      - name: Make binaries executable
+        run: chmod +x ${{ env.MACOS_BUILD_DIR }}/swiftlint ${{ env.LINUX_BUILD_DIR }}/swiftlint_linux_amd64
       - name: Create SPM artifact bundle
         run: make --debug spm_artifactbundle
       - name: Update binary target in Swift package
diff --git a/Makefile b/Makefile
index 99d1378a9a..9fa3fbbaf2 100644
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ bazel_test:
 
 bazel_release: $(SWIFTLINT_EXECUTABLE)
 	bazel build :release
-	mv -f bazel-bin/bazel.tar.gz bazel-bin/bazel.tar.gz.sha256 .
+	mv -f bazel-bin/bazel.tar.gz bazel-bin/bazel.tar.gz.sha256 $(SWIFTLINT_EXECUTABLE) .
 
 docker_image:
 	docker build --platform linux/amd64 --force-rm --tag swiftlint .