Skip to content

Commit 9a985a6

Browse files
authored
Update README during release-prep instead of after release (#659)
This simplifies our release process and keeps it in line with other projects we support. Mostly reverts commit 592a428
1 parent bade135 commit 9a985a6

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,3 @@ jobs:
7575
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7676
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7777
AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
78-
79-
- name: Create NTH README Update PR
80-
run: make create-release-prep-pr-readme

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ create-local-release-tag-patch:
158158
create-release-prep-pr:
159159
${MAKEFILE_PATH}/scripts/prepare-for-release
160160

161-
create-release-prep-pr-readme:
162-
${MAKEFILE_PATH}/scripts/prepare-for-release -m
163-
164161
create-release-prep-pr-draft:
165162
${MAKEFILE_PATH}/scripts/prepare-for-release -d
166163

scripts/prepare-for-release

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ CHART=$REPO_ROOT_PATH/config/helm/aws-node-termination-handler/Chart.yaml
2323
CURR_CHART_VERSION=$(cat $CHART | grep 'version:' | xargs | cut -d' ' -f2 | tr -d '[:space:]')
2424
UPDATED_CHART_VERSION=""
2525
CHART_VALUES=$REPO_ROOT_PATH/config/helm/aws-node-termination-handler/values.yaml
26-
# ReadMe will be updated post-release due to long NTH release time
27-
FILES=("$CHART" "$CHART_VALUES")
26+
FILES=("$REPO_README" "$CHART" "$CHART_VALUES")
2827
FILES_CHANGED=()
2928

3029
# release prep
@@ -54,7 +53,6 @@ HELP=$(cat << 'EOM'
5453
5554
Options:
5655
-d create a draft pr
57-
-m update versions in ReadMe only
5856
-r target repo full name for the pr (default: aws/aws-node-termination-handler)
5957
-h help
6058
@@ -69,7 +67,7 @@ REPO_FULL_NAME=""
6967
NEED_ROLLBACK=true
7068

7169
process_args() {
72-
while getopts "hdmr:" opt; do
70+
while getopts "hdr:" opt; do
7371
case ${opt} in
7472
h )
7573
echo -e "$HELP" 1>&2
@@ -78,13 +76,6 @@ process_args() {
7876
d )
7977
DRAFT=true
8078
;;
81-
m )
82-
FILES=("$REPO_README")
83-
# release should be completed, so no longer prep
84-
COMMIT_MESSAGE="🥑🤖 $LATEST_TAG release 🤖🥑"
85-
PR_TITLE="🥑🤖 $LATEST_TAG release"
86-
RELEASE_PREP=false
87-
;;
8879
r )
8980
# todo: validate $REPO_FULL_NAME
9081
REPO_FULL_NAME="${OPTARG}"

0 commit comments

Comments
 (0)