Skip to content

Commit 272ecb6

Browse files
authored
Fix py module release (#2057)
* Remove release steps on creating/drafting a new project board Signed-off-by: wslulciuc <willy@datakin.com> * Add new line Signed-off-by: wslulciuc <willy@datakin.com>
1 parent d5a4251 commit 272ecb6

2 files changed

Lines changed: 14 additions & 24 deletions

File tree

RELEASING.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
1212
3. Visit [CI](https://app.circleci.com/pipelines/github/MarquezProject/marquez?branch=main) to see the progress of the release! :rocket:
1313
4. Visit [sonatype](https://oss.sonatype.org) to promote _java_ artifacts
14-
5. Create a [new project](https://github.com/MarquezProject/marquez/projects/new) board for the _next_ release using the _automated kanban_ template:
15-
16-
![](./docs/assets/images/new-project-board.png)
17-
18-
6. Before closing the project board for the _current_ release, move any open issues to the project board created in **step 5**
19-
7. Draft a [new release](https://github.com/MarquezProject/marquez/releases/new) using the release notes for `X.Y.Z` in **step 1** as the release description:
14+
6. Draft a [new release](https://github.com/MarquezProject/marquez/releases/new) using the release notes for `X.Y.Z` in **step 1** as the release description:
2015

2116
![](./docs/assets/images/new-release.png)
2217

@@ -32,4 +27,4 @@ Alternatively, if after 2 days the release has received at least one +1 and no -
3227

3328
If the proposed release receives no +1s in two days, it is not authorized and the proposer must make a new request to reset the clock.
3429

35-
Once a release is authorized, it will be initiated within two business days. Releases will not be made on a Friday unless doing so will address an important defect, an issue with project infrastructure, or a security vulnerability.
30+
Once a release is authorized, it will be initiated within two business days. Releases will not be made on a Friday unless doing so will address an important defect, an issue with project infrastructure, or a security vulnerability.

new-version.sh

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -122,39 +122,34 @@ if [[ "${RELEASE_VERSION}" == *-rc.? ]]; then
122122
PYTHON_RELEASE_VERSION="${RELEASE_VERSION%-*}${RELEASE_CANDIDATE//.}"
123123
fi
124124

125-
# (1) Bump python module versions
126-
PYTHON_MODULES=(clients/python/)
127-
for PYTHON_MODULE in "${PYTHON_MODULES[@]}"; do
128-
(cd "${PYTHON_MODULE}" && bump2version manual --new-version "${PYTHON_RELEASE_VERSION}" --allow-dirty)
129-
done
130-
131-
# (2) Bump java module versions
125+
# (1) Bump java module versions
132126
sed -i "" "s/version=.*/version=${RELEASE_VERSION}/g" gradle.properties
133127

134-
# (3) Bump version in helm chart
128+
# (2) Bump version in helm chart
135129
sed -i "" "s/^version:.*/version: ${RELEASE_VERSION}/g" ./chart/Chart.yaml
136130
sed -i "" "s/tag:.*/tag: ${RELEASE_VERSION}/g" ./chart/values.yaml
137131

138-
# (4) Bump version in scripts
132+
# (3) Bump version in scripts
139133
sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" ./docker/up.sh
140134
sed -i "" "s/TAG=\d.*/TAG=${RELEASE_VERSION}/g" .env.example
141135

142-
# (5) Bump version in docs
136+
# (4) Bump version in docs
143137
sed -i "" "s/^ version:.*/ version: ${RELEASE_VERSION}/g" ./spec/openapi.yml
144138
sed -i "" "s/<version>.*/<version>${RELEASE_VERSION}<\/version>/g" ./clients/java/README.md
145139
sed -i "" "s/marquez-java:.*/marquez-java:${RELEASE_VERSION}/g" ./clients/java/README.md
146140

147-
# (6) Bundle openAPI docs
141+
# (5) Bundle openAPI docs
148142
redoc-cli bundle spec/openapi.yml --output docs/openapi.html --title "Marquez API Reference"
149143

150-
# (7) Prepare release commit
144+
# (6) Prepare release commit
151145
git commit -sam "Prepare for release ${RELEASE_VERSION}" --no-verify
152146

153-
# (8) Pull latest tags, then prepare release tag
147+
# (7) Pull latest tags, then prepare release tag
154148
git fetch --all --tags
155149
git tag -a "${RELEASE_VERSION}" -m "marquez ${RELEASE_VERSION}"
156150

157-
# (9) Prepare next development version for python and java modules
151+
# (8) Prepare next development version for python and java modules
152+
PYTHON_MODULES=(clients/python/)
158153
for PYTHON_MODULE in "${PYTHON_MODULES[@]}"; do
159154
(cd "${PYTHON_MODULE}" && bump2version manual --new-version "${NEXT_VERSION}" --allow-dirty)
160155
done
@@ -167,10 +162,10 @@ fi
167162
sed -i "" "s/version=.*/version=${NEXT_VERSION}/g" gradle.properties
168163
sed -i "" "s/^ version:.*/ version: ${NEXT_VERSION}/g" ./spec/openapi.yml
169164

170-
# (10) Prepare next development version commit
165+
# (9) Prepare next development version commit
171166
git commit -sam "Prepare next development version ${NEXT_VERSION}" --no-verify
172167

173-
# (11) Check for commits in log
168+
# (10) Check for commits in log
174169
COMMITS=false
175170
MESSAGE_1=$(git log -1 --grep="Prepare for release ${RELEASE_VERSION}" --pretty=format:%s)
176171
MESSAGE_2=$(git log -1 --grep="Prepare next development version ${NEXT_VERSION}" --pretty=format:%s)
@@ -182,7 +177,7 @@ else
182177
exit 0
183178
fi
184179

185-
# (12) Push commits and tag
180+
# (11) Push commits and tag
186181
if [[ $COMMITS = "true" ]] && [[ ${PUSH} = "true" ]]; then
187182
git push origin main && \
188183
git push origin "${RELEASE_VERSION}"

0 commit comments

Comments
 (0)