| Message ID | 20240410-dei-main-ci-v1-2-25e2dc7b1b39@ovn.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Horman |
| Headers | show |
| Series | ci: Remove reference to master 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 10 Apr 2024, at 16:09, Simon Horman wrote: > The OvS primary development branch has been renamed main > so there is no longer any need for this CI configuration > to refer to master. > > Signed-off-by: Simon Horman <horms@ovn.org> Thanks for following through with the main branch change. Acked-by: Eelco Chaudron <echaudro@redhat.com>
On 4/10/24 16:09, Simon Horman wrote: > The OvS primary development branch has been renamed main > so there is no longer any need for this CI configuration > to refer to master. > > Signed-off-by: Simon Horman <horms@ovn.org> > --- > .github/workflows/build-and-test.yml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml > index 6f5139304ae2..2d64937e41b2 100644 > --- a/.github/workflows/build-and-test.yml > +++ b/.github/workflows/build-and-test.yml > @@ -307,7 +307,7 @@ jobs: > MIN_DISTANCE=1000 > git remote add upstream https://github.com/openvswitch/ovs.git > git fetch upstream > - for upstream_head in $(git ls-remote --heads upstream main master dpdk-latest branch-2.17 branch-[3456789]* | cut -f 1); do > + for upstream_head in $(git ls-remote --heads upstream main dpdk-latest branch-2.17 branch-[3456789]* | cut -f 1); do > CURR_BASE=$(git merge-base ${upstream_head} HEAD 2>/dev/null) > if [ ${CURR_BASE} ]; then > DISTANCE=$(git log --oneline ${CURR_BASE}..HEAD | wc -l); > Acked-by: Ilya Maximets <i.maximets@ovn.org>
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6f5139304ae2..2d64937e41b2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -307,7 +307,7 @@ jobs: MIN_DISTANCE=1000 git remote add upstream https://github.com/openvswitch/ovs.git git fetch upstream - for upstream_head in $(git ls-remote --heads upstream main master dpdk-latest branch-2.17 branch-[3456789]* | cut -f 1); do + for upstream_head in $(git ls-remote --heads upstream main dpdk-latest branch-2.17 branch-[3456789]* | cut -f 1); do CURR_BASE=$(git merge-base ${upstream_head} HEAD 2>/dev/null) if [ ${CURR_BASE} ]; then DISTANCE=$(git log --oneline ${CURR_BASE}..HEAD | wc -l);
The OvS primary development branch has been renamed main so there is no longer any need for this CI configuration to refer to master. Signed-off-by: Simon Horman <horms@ovn.org> --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)