Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

CI: always build and push docker images#935

Closed
lukaszstolarczuk wants to merge 1 commit intopmem:stable-1.5from
lukaszstolarczuk:always-rebuild-dockers-on-stables
Closed

CI: always build and push docker images#935
lukaszstolarczuk wants to merge 1 commit intopmem:stable-1.5from
lukaszstolarczuk:always-rebuild-dockers-on-stables

Conversation

@lukaszstolarczuk
Copy link
Copy Markdown
Member

@lukaszstolarczuk lukaszstolarczuk commented Oct 13, 2020

On stable branches we don't commit much, so this will hardly impact
usage of our CI, and since we always rebuild, script 'pull-or-rebuild.sh'
is no longer necessary.

It's an alternative for #929 :

  • it removes dead code from the stable branch,
  • it simplifies read of the workload,
  • but it will require to clean stable branch each time after release (RELEASE_STEPS.md will be updated if we choose this option).

This change is Reviewable

Copy link
Copy Markdown

@karczex karczex left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: 0 of 2 files reviewed, all discussions resolved

On stable branches we don't commit much, so this will hardly impact
usage of our CI, and since we always rebuild, script 'pull-or-rebuild.sh'
is no longer necessary.
@lukaszstolarczuk lukaszstolarczuk force-pushed the always-rebuild-dockers-on-stables branch from bd66ee0 to 3ffa1f2 Compare October 14, 2020 10:46
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 14, 2020

Codecov Report

Merging #935 into stable-1.5 will increase coverage by 0.11%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##           stable-1.5     #935      +/-   ##
==============================================
+ Coverage       90.32%   90.43%   +0.11%     
==============================================
  Files              26       26              
  Lines            1023     1025       +2     
==============================================
+ Hits              924      927       +3     
+ Misses             99       98       -1     
Flag Coverage Δ
#tests_clang_debug_cpp17 61.93% <ø> (?)
#tests_clang_release 61.46% <ø> (ø)
#tests_gcc_debug 93.40% <ø> (ø)
#tests_gcc_release_cpp17 ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
include/libpmemobj++/detail/life.hpp 92.30% <0.00%> (+0.64%) ⬆️
include/libpmemobj++/make_persistent_atomic.hpp 90.90% <0.00%> (+0.90%) ⬆️
include/libpmemobj++/detail/make_atomic_impl.hpp 94.44% <0.00%> (+5.55%) ⬆️

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 ac52adb...3ffa1f2. Read the comment docs.

@karczex
Copy link
Copy Markdown

karczex commented Oct 14, 2020

@lukaszstolarczuk
It should be possible to trigger server-side post-receive hook to cherry-pick some patches (like this one) on stable branch creation.

Copy link
Copy Markdown
Contributor

@igchor igchor left a comment

Choose a reason for hiding this comment

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

TBH, I'd prefer https://github.com/pmem/libpmemobj-cpp/pull/929/files

With this approach we'll have to resolve merge conflicts for each new stable branch when merging with master.

Reviewable status: 0 of 2 files reviewed, all discussions resolved

@lukaszstolarczuk
Copy link
Copy Markdown
Member Author

#929 is most likely the way we go to solve our problem.

@lukaszstolarczuk lukaszstolarczuk deleted the always-rebuild-dockers-on-stables branch October 28, 2020 10:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants