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

Release/1.2.0 #583

Merged
merged 736 commits into from
Jul 7, 2020
Merged

Release/1.2.0 #583

merged 736 commits into from
Jul 7, 2020

Conversation

tcojean
Copy link
Member

@tcojean tcojean commented Jul 6, 2020

This merges all commits from develop into master for the release 1.2.0.

The documentation will be available here once updated:
https://ginkgo-project.github.io/ginkgo/doc/release/1.2.0/

We should see a based on branch master in the title.

@tcojean tcojean added 1:ST:ready-for-review This PR is ready for review 1:ST:high-importance This issue/PR is of high importance and must be addressed as soon as possible. labels Jul 6, 2020
@tcojean tcojean self-assigned this Jul 6, 2020
pratikvn
pratikvn previously approved these changes Jul 6, 2020
Copy link
Member

@pratikvn pratikvn left a comment

Choose a reason for hiding this comment

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

The fastest review in the west!

upsj
upsj previously approved these changes Jul 6, 2020
thoasm
thoasm previously approved these changes Jul 6, 2020
Copy link
Member

@thoasm thoasm left a comment

Choose a reason for hiding this comment

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

LGTM!

@tcojean tcojean removed the 1:ST:ready-for-review This PR is ready for review label Jul 6, 2020
@tcojean tcojean requested review from upsj, pratikvn and thoasm July 6, 2020 14:05
@tcojean tcojean added the 1:ST:WIP This PR is a work in progress. Not ready for review. label Jul 6, 2020
hartwiganzt
hartwiganzt previously approved these changes Jul 6, 2020
@tcojean tcojean dismissed stale reviews from hartwiganzt, thoasm, upsj, and pratikvn via 62a03d4 July 6, 2020 15:25
@tcojean tcojean force-pushed the release/1.2.0 branch 2 times, most recently from 62a03d4 to baa0a88 Compare July 6, 2020 15:48
@tcojean tcojean added 1:ST:ready-for-review This PR is ready for review and removed 1:ST:WIP This PR is a work in progress. Not ready for review. labels Jul 6, 2020
@tcojean
Copy link
Member Author

tcojean commented Jul 6, 2020

This should now be in a working state. The compiled documentation is available in the original post.

For some reason, a couple some got lost during the rebase so I had to manually fix the issues.

A good way to see what changes with develop:

git diff develop..release/1.2.0

@sonarcloud
Copy link

sonarcloud bot commented Jul 7, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

55.1% 55.1% Coverage
8.7% 8.7% Duplication

warning The version of Java (1.8.0_121) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

@codecov
Copy link

codecov bot commented Jul 7, 2020

Codecov Report

Merging #583 into master will decrease coverage by 13.86%.
The diff coverage is 74.88%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #583       +/-   ##
===========================================
- Coverage   98.09%   84.22%   -13.87%     
===========================================
  Files         215      296       +81     
  Lines       16058    20655     +4597     
===========================================
+ Hits        15752    17397     +1645     
- Misses        306     3258     +2952     
Impacted Files Coverage Δ
core/base/executor.cpp 18.18% <0.00%> (-4.05%) ⬇️
core/base/utils.hpp 0.00% <0.00%> (ø)
core/device_hooks/common_kernels.inc.cpp 0.00% <ø> (ø)
core/device_hooks/cuda_hooks.cpp 55.55% <ø> (ø)
core/device_hooks/hip_hooks.cpp 55.55% <ø> (ø)
core/devices/cuda/executor.cpp 50.00% <ø> (-50.00%) ⬇️
core/devices/hip/executor.cpp 33.33% <ø> (ø)
core/devices/omp/executor.cpp 100.00% <ø> (ø)
core/factorization/ilu.cpp 0.00% <ø> (ø)
core/factorization/par_ict.cpp 89.36% <ø> (ø)
... and 408 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 08d2c52...cb29b44. Read the comment docs.

Copy link
Member

@pratikvn pratikvn left a comment

Choose a reason for hiding this comment

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

LGTM!

@tcojean tcojean requested a review from hartwiganzt July 7, 2020 09:11
Copy link
Member

@thoasm thoasm left a comment

Choose a reason for hiding this comment

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

LGTM!

CMakeLists.txt Show resolved Hide resolved
@thoasm
Copy link
Member

thoasm commented Jul 7, 2020

After we are done with the release, I think we should increase the version in develop to 1.2.1, so it is different from master.

@tcojean
Copy link
Member Author

tcojean commented Jul 7, 2020

About the develop version, yes it would be nice but an issue is we do not know if we will have a 1.2.1 or if the next one will be 1.3.0.

@tcojean tcojean added 1:ST:ready-to-merge This PR is ready to merge. and removed 1:ST:ready-for-review This PR is ready for review labels Jul 7, 2020
Copy link
Member

@yhmtsai yhmtsai left a comment

Choose a reason for hiding this comment

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

Can the version contain letters? maybe like 1.2.0-develop

@pratikvn
Copy link
Member

pratikvn commented Jul 7, 2020

Or we could name is 1.x.x-pre-release or something like that.

@yhmtsai
Copy link
Member

yhmtsai commented Jul 7, 2020

I found we already set Ginkgo_VERSION_TAG master in master branch and develop in develop branch.
Maybe already solved it?

@tcojean tcojean merged commit b4be2be into master Jul 7, 2020
@tcojean tcojean deleted the release/1.2.0 branch July 7, 2020 14:04
@tcojean
Copy link
Member Author

tcojean commented Jul 7, 2020

Yes actually we do have that VERSION_TAG distinction so that is exactly like @yhmtsai previously said, 1.2.0-develop and 1.2.0-master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1:ST:high-importance This issue/PR is of high importance and must be addressed as soon as possible. 1:ST:ready-to-merge This PR is ready to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants