search

OpenVPN / openvpn-build

OpenVPN Build
326 stars 238 forks source link

Prepare release of 2.6.10-I002 #625

Closed uddr closed 7 months ago

flichtenheld commented 7 months ago

This looks wrong from a history point. This is branched from tip of release/2.6 instead 2.6.10-I001. So it contains src/openvpn that was probably not used for build. Not sure whether we want to clean this up, because this then would mean that we tag something that was not the actual commit used for build. Let's discuss. But definitely just want to merge this.

uddr commented 7 months ago

@flichtenheld this is a good question

So I took OpenVPN-2.6.10-I001 tag as a base, added there 'update dependency openvpn/ovpn-dco-win to v1.1.1' And based on this I created the release and tagged it as OpenVPN-2.6.10-I002 Then created from OpenVPN-2.6.10-I002 tag this yuriy/msi-I002-build branch and rebased release/2.6 into

What is the best way to have it done properly? Maybe include in this commit all submodules and other changes we had during the release? Get it equal to OpenVPN-2.6.10-I001 tag? And then in the separate commit cover the latest updates we have in release/2.6?

flichtenheld commented 7 months ago

Why the rebase? Just merge the tag directly into release/2.6 with a merge commit. The tag should be part of the history

uddr commented 7 months ago

got it, thanks! updated