| Message ID | 20240322-appveyor-primary-fallback-v1-1-7fe0cab936bf@ovn.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Horman |
| Headers | show |
| Series | [ovs-dev] appveyor: Prepare for rename of primary development branch. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/intel-ovs-compilation | success | test: success |
On 3/22/24 16:11, Simon Horman wrote: > Recently OVS adopted a policy of using the inclusive naming word list v1 > [1, 2]. And in keeping with this policy it is intended to rename the > primary development branch from master to main [3]. > > In order to help facilitate this change allow Appveyor to run > on the main as well as master branch. It is intended that > master branch will be removed from appveyor.yml after the primary branch > has been renamed. > > Also, update the string included in artifacts from 'master' to 'main'. > > [1] df5e5cf ("Documentation: Add section on inclusive language.") Nit: Usual recommendation is to use 12 hex digits for commit hashes. > [2] https://inclusivenaming.org/word-lists/ > [3] https://mail.openvswitch.org/pipermail/ovs-dev/2024-March/412686.html > > Signed-off-by: Simon Horman <horms@ovn.org> > --- > * Exercised successfully using Appveyor with this patch applied to a > main and master branch. Thanks, Simon! Seem to work for me as well. Acked-by: Ilya Maximets <i.maximets@ovn.org>
On Thu, Mar 28, 2024 at 01:02:18PM +0100, Ilya Maximets wrote: > On 3/22/24 16:11, Simon Horman wrote: > > Recently OVS adopted a policy of using the inclusive naming word list v1 > > [1, 2]. And in keeping with this policy it is intended to rename the > > primary development branch from master to main [3]. > > > > In order to help facilitate this change allow Appveyor to run > > on the main as well as master branch. It is intended that > > master branch will be removed from appveyor.yml after the primary branch > > has been renamed. > > > > Also, update the string included in artifacts from 'master' to 'main'. > > > > [1] df5e5cf ("Documentation: Add section on inclusive language.") > > Nit: Usual recommendation is to use 12 hex digits for commit hashes. Thanks, I'm not sure what I was thinking there. > > [2] https://inclusivenaming.org/word-lists/ > > [3] https://mail.openvswitch.org/pipermail/ovs-dev/2024-March/412686.html > > > > Signed-off-by: Simon Horman <horms@ovn.org> > > --- > > * Exercised successfully using Appveyor with this patch applied to a > > main and master branch. > > Thanks, Simon! Seem to work for me as well. > > Acked-by: Ilya Maximets <i.maximets@ovn.org> Thanks, applied with the hash extended to 12 characters. - appveyor: Prepare for rename of primary development branch. https://github.com/openvswitch/ovs/commit/95ff912edef8
diff --git a/appveyor.yml b/appveyor.yml index 29cc44d6c6f6..050c7dead786 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: 1.0.{build} image: Visual Studio 2019 branches: only: + - main - master configuration: - Debug @@ -74,6 +75,6 @@ build_script: c:\OpenvSwitch-$env:CONFIGURATION.msi after_build: -- ps: 7z a C:\ovs-master-$env:CONFIGURATION.zip C:\openvswitch -- ps: Push-AppveyorArtifact C:\ovs-master-$env:CONFIGURATION.zip +- ps: 7z a C:\ovs-main-$env:CONFIGURATION.zip C:\openvswitch +- ps: Push-AppveyorArtifact C:\ovs-main-$env:CONFIGURATION.zip - ps: Push-AppveyorArtifact C:\OpenvSwitch-$env:CONFIGURATION.msi
Recently OVS adopted a policy of using the inclusive naming word list v1 [1, 2]. And in keeping with this policy it is intended to rename the primary development branch from master to main [3]. In order to help facilitate this change allow Appveyor to run on the main as well as master branch. It is intended that master branch will be removed from appveyor.yml after the primary branch has been renamed. Also, update the string included in artifacts from 'master' to 'main'. [1] df5e5cf ("Documentation: Add section on inclusive language.") [2] https://inclusivenaming.org/word-lists/ [3] https://mail.openvswitch.org/pipermail/ovs-dev/2024-March/412686.html Signed-off-by: Simon Horman <horms@ovn.org> --- * Exercised successfully using Appveyor with this patch applied to a main and master branch. --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)