From 03f77b596e2405fb190793a3d710a5eedd007f60 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Fri, 16 Feb 2024 17:34:24 +0100
Subject: [PATCH] Smooth out release steps (#197)

Couple of small things:

- The license check failed because the `dist/*` files were there
- Add `dist/*` to gitignore since we don't want to push these files to the repo
- Make `scripts/release.sh` executable
- Align the svn structure with PyIceberg and Java
---
 .gitignore             |  3 ++-
 .licenserc.yaml        |  2 ++
 scripts/release.sh     |  0
 website/src/release.md | 11 ++++++-----
 4 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 scripts/release.sh

diff --git a/.gitignore b/.gitignore
index 72c34840c..25b803228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,5 @@
 /Cargo.lock
 .idea
 .vscode
-**/.DS_Store
\ No newline at end of file
+**/.DS_Store
+dist/*
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 68a8c03b0..38aa58402 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -29,4 +29,6 @@ header:
     - 'website/book'
     # Generated content by scripts
     - '**/DEPENDENCIES.*.tsv'
+    # Release distributions
+    - 'dist/*'
   comment: on-failure
diff --git a/scripts/release.sh b/scripts/release.sh
old mode 100644
new mode 100755
diff --git a/website/src/release.md b/website/src/release.md
index 18b108851..d316e9cdc 100644
--- a/website/src/release.md
+++ b/website/src/release.md
@@ -169,7 +169,7 @@ First, checkout Iceberg to local directory:
 
 ```shell
 # As this step will copy all the versions, it will take some time. If the network is broken, please use svn cleanup to delete the lock before re-execute it.
-svn co https://dist.apache.org/repos/dist/dev/iceberg/iceberg-rust iceberg-dist-dev
+svn co https://dist.apache.org/repos/dist/dev/iceberg/ /tmp/iceberg-dist-dev
 ```
 
 Then, upload the artifacts:
@@ -177,11 +177,12 @@ Then, upload the artifacts:
 > The `${release_version}` here should be like `0.2.0-rc.1`
 
 ```shell
-cd iceberg-dist-dev
 # create a directory named by version
-mkdir ${release_version}
+mkdir /tmp/iceberg-dist-dev/${release_version}
 # copy source code and signature package to the versioned directory
-cp ${repo_dir}/dist/* ${release_version}/
+cp ${repo_dir}/dist/* /tmp/iceberg-dist-dev/iceberg-rust-${release_version}/
+# change dir to the svn folder
+cd /tmp/iceberg-dist-dev/
 # check svn status
 svn status
 # add to svn
@@ -222,7 +223,7 @@ The tag to be voted on is ${iceberg_version}.
 
 The release candidate:
 
-https://dist.apache.org/repos/dist/dev/iceberg/iceberg-rust/${release_version}/
+https://dist.apache.org/repos/dist/dev/iceberg/iceberg-rust-${release_version}/
 
 Keys to verify the release candidate: