From 08dbe24d28a6f28d8073e604c8258e3966923b9b Mon Sep 17 00:00:00 2001
From: Cheng Pan <379377944@qq.com>
Date: Sun, 28 Feb 2021 23:05:36 +0800
Subject: [PATCH] [KYUUBI #380] [FOLLOWUP #377] change default distribution
 bundle name, and distribute without spark bundle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

![pan3793](https://badgen.net/badge/Hello/pan3793/green) [![Closes #380](https://badgen.net/badge/Preview/Closes%20%23380/blue)](https://github.com/yaooqinn/kyuubi/pull/380) ![4](https://badgen.net/badge/%2B/4/red) ![2](https://badgen.net/badge/-/2/green) ![1](https://badgen.net/badge/commits/1/yellow) ![Target Issue](https://badgen.net/badge/Missing/Target%20Issue/ff0000) [&#10088;?&#10089;](https://pullrequestbadge.com/?utm_medium=github&utm_source=yaooqinn&utm_campaign=badge_info)<!-- PR-BADGE: PLEASE DO NOT REMOVE THIS COMMENT -->

<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/yaooqinn/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->

This is a followup of #377, change list:

- change the spark version suffix in default distribution bundle name from `spark-{major}.{minor}.{patch}` to `spark-{major}.{minor}`
- release distribution bundles both with spark and without spark

Consider Kyuubi 1.1.x has not released, the available distribution still in old style, so now just keep the doc as is.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.readthedocs.io/en/latest/tools/testing.html#running-tests) locally before make a pull request

- [x] Manual test

`build/dist --tgz`
```
➜  kyuubi git:(master) ✗ ls | grep tar.gz
kyuubi-1.1.0-SNAPSHOT-bin-spark-3.0.tar.gz
```

Closes #380 from pan3793/build.

36fa006 [Cheng Pan] [FOLLOWUP #377] change default distribution bundle name, and distribute without spark bundle

Authored-by: Cheng Pan <379377944@qq.com>
Signed-off-by: Kent Yao <yao@apache.org>
---
 .github/workflows/release.yml | 4 +++-
 build/dist                    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 010228cee..7de5b97b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,8 +34,10 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '1.8'
-      - name: Make Distribution
+      - name: Make Distribution with Spark
         run: ./build/dist --tgz
+      - name: Make Distribution without Spark
+        run: ./build/dist --tgz --spark-provided
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
diff --git a/build/dist b/build/dist
index 2002da8b7..b6210e0c3 100755
--- a/build/dist
+++ b/build/dist
@@ -144,7 +144,7 @@ if [[ "$NAME" == "none" ]]; then
   if [[ "$SPARK_PROVIDED" == "true" ]]; then
     NAME="without-spark"
   else
-    NAME="spark-"$SPARK_VERSION
+    NAME="spark-"${SPARK_VERSION:0:3}
   fi
 fi