Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add apache-release.sh & prepare release #218

Merged
merged 5 commits into from
Dec 15, 2022
Merged

Conversation

imbajin
Copy link
Member

@imbajin imbajin commented Dec 7, 2022

use rebase merge to keep the commit after #217

Remember rename current branch to release-1.0.0 first (for script running):

git branch -m before-release release-1.0.0

and @coderzc keep test & update the script (ammend to the 4th commit) to keep commit clean

other chore:

  • release -> apache-release
  • ignore javadoc error
  • fix shell execute permission

@codecov
Copy link

codecov bot commented Dec 8, 2022

Codecov Report

Merging #218 (3360aaf) into master (73b804d) will not change coverage.
The diff coverage is n/a.

❗ Current head 3360aaf differs from pull request most recent head e806302. Consider uploading reports for the commit e806302 to get more accurate results

@@            Coverage Diff            @@
##             master     #218   +/-   ##
=========================================
  Coverage     85.74%   85.74%           
+ Complexity     3231     3230    -1     
=========================================
  Files           344      344           
  Lines         12079    12079           
  Branches       1087     1087           
=========================================
  Hits          10357    10357           
+ Misses         1195     1194    -1     
- Partials        527      528    +1     
Impacted Files Coverage Δ
...k8s/operator/controller/ComputerJobController.java 86.98% <0.00%> (-1.72%) ⬇️
...apache/hugegraph/computer/core/bsp/EtcdClient.java 72.81% <0.00%> (+0.92%) ⬆️
...h/computer/core/network/session/ClientSession.java 84.42% <0.00%> (+2.45%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@imbajin imbajin marked this pull request as ready for review December 8, 2022 09:53
@coderzc coderzc force-pushed the before-release branch 2 times, most recently from 8458545 to 3a111d7 Compare December 8, 2022 14:14
@coderzc coderzc changed the title chore: add .gitattributes file to exclude source chore: add apache-release.sh & prepare release Dec 9, 2022
coderzc
coderzc previously approved these changes Dec 9, 2022
# git release branch (check it carefully)
GIT_BRANCH="release-${RELEASE_VERSION}"
GIT_BRANCH="$(git branch --show-current)"
Copy link
Member Author

Choose a reason for hiding this comment

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

seems a little dangerous when upload with a wrong branch? or check the branch-name below?

Copy link
Member

Choose a reason for hiding this comment

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

ok

.gitattributes Outdated
assembly/ export-ignore
computer-dist/src/assembly/ export-ignore
computer-k8s-operator/crd-generate/bin/ export-ignore
logs/ export-ignore
Copy link
Member Author

Choose a reason for hiding this comment

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

if logs ignored in .gitignore already, it won't be packaged by default

Copy link
Member

Choose a reason for hiding this comment

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

I see

pom.xml Outdated Show resolved Hide resolved
computer-dist/scripts/apache-release.sh Outdated Show resolved Hide resolved
computer-dist/scripts/apache-release.sh Outdated Show resolved Hide resolved
computer-dist/scripts/apache-release.sh Outdated Show resolved Hide resolved
if [ "$USERNAME" = "" ]; then
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}"
else
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}" --username ${USERNAME} --password ${PASSWORD}
Copy link
Member Author

Choose a reason for hiding this comment

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

  • double quota for $username & $password
  • use 2 spaces instead of 4 before svn
if [ "$USERNAME" = "" ]; then
  svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}"
else
  svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}" --username "${USERNAME}" --password "${PASSWORD}"
fi

@imbajin
Copy link
Member Author

imbajin commented Dec 12, 2022

image

@coderzc coderzc force-pushed the before-release branch 2 times, most recently from da3dbce to 08c1b6a Compare December 15, 2022 04:54
@coderzc coderzc force-pushed the before-release branch 2 times, most recently from a0bf049 to 3360aaf Compare December 15, 2022 06:25
coderzc
coderzc previously approved these changes Dec 15, 2022
@imbajin
Copy link
Member Author

imbajin commented Dec 15, 2022

update the commit log & use rebase merge option

@zyxxoo zyxxoo merged commit dd1f82e into master Dec 15, 2022
@zyxxoo zyxxoo deleted the before-release branch December 15, 2022 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants