Skip to content

Fix branch reference error#834

Merged
xumia merged 2 commits intosonic-net:202012from
xumia:fix-azp-202012
Jun 17, 2021
Merged

Fix branch reference error#834
xumia merged 2 commits intosonic-net:202012from
xumia:fix-azp-202012

Conversation

@xumia
Copy link
Collaborator

@xumia xumia commented Jun 2, 2021

Fix branch reference error, change master to 202012

@xumia xumia marked this pull request as draft June 2, 2021 10:58
@kcudnik
Copy link
Collaborator

kcudnik commented Jun 2, 2021

build failing because of this change ?

@xumia
Copy link
Collaborator Author

xumia commented Jun 6, 2021

@kcudnik , Failed to build on 202012 branch, I am not sure whether the change is correct or not.
https://dev.azure.com/mssonic/build/_build/results?buildId=17872&view=results

@kcudnik
Copy link
Collaborator

kcudnik commented Jun 6, 2021

https://dev.azure.com/mssonic/build/_build/results?buildId=17872&view=logs&j=05061332-bfdb-5f6d-a09c-bb63eec6669c&t=9e60e50c-b4b6-53d2-7fd2-99b13f45e3ec

macsecorch.cpp: In member function 'bool MACsecOrch::createMACsecSA(sai_object_id_t&, sai_object_id_t, sai_macsec_direction_t, sai_object_id_t, macsec_an_t, uint8_t*, uint8_t*, sai_uint32_t, uint8_t*, sai_uint64_t)':
macsecorch.cpp:1851:19: error: 'SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN' was not declared in this scope
         attr.id = SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN;
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
macsecorch.cpp:1851:19: note: suggested alternative: 'SAI_MACSEC_SA_ATTR_MINIMUM_XPN'
         attr.id = SAI_MACSEC_SA_ATTR_CONFIGURED_EGRESS_XPN;
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                   SAI_MACSEC_SA_ATTR_MINIMUM_XPN
macsecorch.cpp:1857:19: error: 'SAI_MACSEC_SA_ATTR_MINIMUM_INGRESS_XPN' was not declared in this scope
         attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_INGRESS_XPN;
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
macsecorch.cpp:1857:19: note: suggested alternative: 'SAI_MACSEC_SA_ATTR_MINIMUM_XPN'
         attr.id = SAI_MACSEC_SA_ATTR_MINIMUM_INGRESS_XPN;
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                   SAI_MACSEC_SA_ATTR_MINIMUM_XPN

this changed on master at some point, and those names are no longer valid, could you sync that with master?

@xumia
Copy link
Collaborator Author

xumia commented Jun 14, 2021

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@xumia xumia requested a review from qiluo-msft June 17, 2021 14:24
@xumia xumia marked this pull request as ready for review June 17, 2021 14:24
@xumia xumia merged commit 783c82b into sonic-net:202012 Jun 17, 2021
@kcudnik
Copy link
Collaborator

kcudnik commented Jun 26, 2021

@xumia When merging - please use SQUASH since it's causing merges in branch:

| *   783c82b (origin/202012) Merge pull request #834 from xumia/fix-azp-202012
| |\
| | * c28318f Fix sonic-swss branch reference issue
| | * 08718ef Fix branch reference error
| |/
| * bb13d59 Update call git clean on debian/rules (#826)

@kcudnik
Copy link
Collaborator

kcudnik commented Jun 26, 2021

please fix this by squashing them and making force push on 202012

@xumia
Copy link
Collaborator Author

xumia commented Jun 26, 2021

@kcudnik, what is the impact? Is there any unexpected change in 202012 branch? Could you please add some commands for me to run? Do you suggest to use "Squash and merge" when merging code to the target branch?

@kcudnik
Copy link
Collaborator

kcudnik commented Jun 27, 2021

it's just for esthetic purpose, ok, skip this one, just remember next time click checkbox "squash and merge" on github

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants