From 95ff912edef88160f50f01ddd906869ba6d5b9ba Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 22 Mar 2024 15:11:17 +0000 Subject: [PATCH] appveyor: Prepare for rename of primary development branch. 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] df5e5cf4318a ("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 Acked-by: Ilya Maximets --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 29cc44d6c..050c7dead 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