From 875100e4a33fd26277651b85af8d74acb61ac856 Mon Sep 17 00:00:00 2001
From: wusatosi <26424577+wusatosi@users.noreply.github.com>
Date: Tue, 18 Apr 2023 01:46:03 -0400
Subject: [PATCH] Merge upload clangd and indexing tool as single step

Prob less error prone?
---
 .github/workflows/autobuild.yaml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/autobuild.yaml b/.github/workflows/autobuild.yaml
index 70aec6a..397818a 100644
--- a/.github/workflows/autobuild.yaml
+++ b/.github/workflows/autobuild.yaml
@@ -307,24 +307,19 @@ jobs:
         ${{ env.CLANGD_DIR }}/bin/clangd-index-server${{ matrix.config.binary_extension }}
         ${{ env.CLANGD_DIR }}/bin/clangd-index-server-monitor${{ matrix.config.binary_extension }}
         ${{ env.CLANGD_DIR }}/lib/clang
-    - name: Upload clangd asset
+    - name: Upload clangd asset and indexing tools
       shell: bash
       run: |
-        mv clangd.zip ${{ env.RELEASE_FILE_NAME }} && 
+        mv clangd.zip ${{ env.RELEASE_FILE_NAME }}
         gh release upload ${{ env.TAG_NAME }} ${{ env.RELEASE_FILE_NAME }}
+        
+        mv indexing-tools.zip ${{ env.INDEXING_TOOL_NAME }}
+        gh release upload ${{ env.TAG_NAME }} ${{ env.INDEXING_TOOL_NAME }}
       env:
         GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         GH_REPO: ${{ github.repository }}
         RELEASE_FILE_NAME: clangd-${{ matrix.config.name }}-${{ env.TAG_NAME }}.zip
-    - name: Upload indexing-tools asset
-      shell: bash
-      run: |
-        mv indexing-tools.zip ${{ env.RELEASE_FILE_NAME }} && 
-        gh release upload ${{ env.TAG_NAME }} ${{ env.RELEASE_FILE_NAME }}
-      env:
-        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-        GH_REPO: ${{ github.repository }}
-        RELEASE_FILE_NAME: clangd_indexing_tools-${{ matrix.config.name }}-${{ env.TAG_NAME }}.zip
+        INDEXING_TOOL_NAME: clangd_indexing_tools-${{ matrix.config.name }}-${{ env.TAG_NAME }}.zip
     - name: Check binary compatibility
       if: matrix.config.name == 'linux'
       run: .github/workflows/lib_compat_test.py --lib=GLIBC_2.18 "$CLANGD_DIR/bin/clangd"