Skip to content

Commit 878c0fc

Browse files
authored
chores: optimize release.sh & update asf.yaml (#210)
1. Update asf.yaml to re-enable lost branch rules 2. Optimize release.sh to speed up svn upload process
1 parent 15e1430 commit 878c0fc

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

.asf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ github:
4040
dismiss_stale_reviews: false
4141
required_approving_review_count: 1
4242
required_linear_history: true
43+
required_conversation_resolution: true
4344
release-v4.0: {} # release branch for 4.0.x-incubating
4445
features:
4546
issues: true

release/release.sh

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -168,25 +168,31 @@ done
168168
echo "Signing artifacts..."
169169
bash "${SCRIPT_DIR}/sign-artifacts.sh" "$WORKDIR"
170170

171-
if [ "$UPLOAD" = true ]; then
172-
UPLOAD_DIR="${REVISION}"
173-
if [[ -n "$RC_NUMBER" ]]; then
174-
UPLOAD_DIR="${REVISION}-RC${RC_NUMBER}"
175-
fi
176-
SVN_TMP=$(mktemp -d)
177-
svn checkout "$ASF_SVN_DEV_URL" "$SVN_TMP"
178-
mkdir -p "$SVN_TMP/${UPLOAD_DIR}"
179-
for f in "$WORKDIR"/*; do
180-
if [[ -f "$f" ]]; then
181-
cp "$f" "$SVN_TMP/${UPLOAD_DIR}/"
171+
if [ "$UPLOAD" = true ]; then
172+
UPLOAD_DIR="${REVISION}"
173+
if [[ -n "$RC_NUMBER" ]]; then
174+
UPLOAD_DIR="${REVISION}-RC${RC_NUMBER}"
175+
fi
176+
SVN_TMP=$(mktemp -d)
177+
cd "$SVN_TMP"
178+
svn checkout --depth empty "$ASF_SVN_DEV_URL" "$SVN_TMP"
179+
if svn ls "${ASF_SVN_DEV_URL}/${UPLOAD_DIR}" >/dev/null 2>&1; then
180+
svn update --set-depth infinity "${UPLOAD_DIR}"
181+
svn rm --force "${UPLOAD_DIR}"
182+
else
183+
svn mkdir "${UPLOAD_DIR}"
182184
fi
183-
done
184-
cd "$SVN_TMP"
185-
svn add --force "${UPLOAD_DIR}"
186-
svn status
187-
if [ "$USERNAME" = "" ]; then
188-
svn commit -m "Add release ${UPLOAD_DIR}" || exit
189-
else
185+
mkdir -p "${UPLOAD_DIR}"
186+
for f in "$WORKDIR"/*; do
187+
if [[ -f "$f" ]]; then
188+
cp "$f" "${UPLOAD_DIR}/"
189+
fi
190+
done
191+
svn add --force "${UPLOAD_DIR}"
192+
svn status
193+
if [ "$USERNAME" = "" ]; then
194+
svn commit -m "Add release ${UPLOAD_DIR}" || exit
195+
else
190196
svn commit -m "Add release ${UPLOAD_DIR}" --username "${USERNAME}" --password "${PASSWORD}" || exit
191197
fi
192198
echo "Artifacts uploaded to SVN dev: ${UPLOAD_DIR}"

0 commit comments

Comments
 (0)