Skip to content

Conversation

@maropu
Copy link
Member

@maropu maropu commented Jan 14, 2019

What changes were proposed in this pull request?

To skip some steps to remove binary license/notice files in a source release for branch2.3 (these files only exist in master/branch-2.4 now), this pr checked a Spark release version in dev/create-release/release-build.sh.

How was this patch tested?

Manually checked.

@maropu
Copy link
Member Author

maropu commented Jan 14, 2019

cc: @srowen @dongjoon-hyun

rm -r spark-$SPARK_VERSION/licenses-binary

# For source release in v2.4+, exclude copy of binary license/notice
if [[ $SPARK_VERSION > "2.4" ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems OK, but do the rms cause a problem? if they fail or print an error, add -f? But this is fine too.

Copy link
Member Author

@maropu maropu Jan 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, the script fails and stops for branch-2.3. Both is ok to me, adding -f or checking the version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh I'd just make this change. I'll merge it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, thanks!

@SparkQA
Copy link

SparkQA commented Jan 14, 2019

Test build #101183 has finished for PR 23538 at commit d2489f3.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

srowen pushed a commit that referenced this pull request Jan 15, 2019
… for branch-2.4+ only

## What changes were proposed in this pull request?
To skip some steps to remove binary license/notice files in a source release for branch2.3 (these files only exist in master/branch-2.4 now), this pr checked a Spark release version in `dev/create-release/release-build.sh`.

## How was this patch tested?
Manually checked.

Closes #23538 from maropu/FixReleaseScript.

Authored-by: Takeshi Yamamuro <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
(cherry picked from commit abc937b)
Signed-off-by: Sean Owen <[email protected]>
@srowen srowen closed this in abc937b Jan 15, 2019
@srowen
Copy link
Member

srowen commented Jan 15, 2019

Merged to master/2.4. @maropu am I right that this change doesn't have to be in 2.3 for you to release 2.3.3? It doesn't pick cleanly and 2.3 doesn't have any of this license logic, so I presume you're not using it.

@maropu
Copy link
Member Author

maropu commented Jan 15, 2019

Yea, we don't need to merge this into branch-2.3. Since the release script can handle releases for both branch-2.4/2.3, I'm just using it in master for preparing the v2.3 release candidate.

jackylee-ch pushed a commit to jackylee-ch/spark that referenced this pull request Feb 18, 2019
… for branch-2.4+ only

## What changes were proposed in this pull request?
To skip some steps to remove binary license/notice files in a source release for branch2.3 (these files only exist in master/branch-2.4 now), this pr checked a Spark release version in `dev/create-release/release-build.sh`.

## How was this patch tested?
Manually checked.

Closes apache#23538 from maropu/FixReleaseScript.

Authored-by: Takeshi Yamamuro <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
kai-chi pushed a commit to kai-chi/spark that referenced this pull request Jul 23, 2019
… for branch-2.4+ only

## What changes were proposed in this pull request?
To skip some steps to remove binary license/notice files in a source release for branch2.3 (these files only exist in master/branch-2.4 now), this pr checked a Spark release version in `dev/create-release/release-build.sh`.

## How was this patch tested?
Manually checked.

Closes apache#23538 from maropu/FixReleaseScript.

Authored-by: Takeshi Yamamuro <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
(cherry picked from commit abc937b)
Signed-off-by: Sean Owen <[email protected]>
kai-chi pushed a commit to kai-chi/spark that referenced this pull request Aug 1, 2019
… for branch-2.4+ only

## What changes were proposed in this pull request?
To skip some steps to remove binary license/notice files in a source release for branch2.3 (these files only exist in master/branch-2.4 now), this pr checked a Spark release version in `dev/create-release/release-build.sh`.

## How was this patch tested?
Manually checked.

Closes apache#23538 from maropu/FixReleaseScript.

Authored-by: Takeshi Yamamuro <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
(cherry picked from commit abc937b)
Signed-off-by: Sean Owen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants