Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 1.4 DM XMLs to latest #37146

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Update 1.4 DM XMLs to latest #37146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
990d225
Update 1.4 DM XMLs to latest
cecille Jan 21, 2025
94759aa
Fix CI checker so it properly checks spec_sha
cecille Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions data_model/1.4/clusters/EcosystemInformationCluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,18 @@ Davis, CA 95616, USA
<access fabricScoped="true"/>
</struct>
</dataTypes>
<attributes>
<attribute id="0x0000" name="DeviceDirectory" type="list">
<entry type="EcosystemDeviceStruct"/>
<access read="true" readPrivilege="manage" fabricScoped="true"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0001" name="LocationDirectory" type="list">
<entry type="EcosystemLocationStruct"/>
<access read="true" readPrivilege="manage" fabricScoped="true"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
</attributes>
</cluster>
2 changes: 1 addition & 1 deletion data_model/1.4/spec_sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3d8fc9ae05045a53fdaffd7e3593f92a48b10e30
21812107312887c416632ed6dd2399af1f077548
4 changes: 2 additions & 2 deletions scripts/dm_xml_ci_change_enforcement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ def check_dm_directory(dir):

def check_dir(dir):
cmd = f'git diff HEAD^..HEAD --name-only -- {dir}'
output = subprocess.check_output(cmd, shell=True).decode().splitlines()
output = subprocess.check_output(cmd, shell=True).decode()
if output and 'spec_sha' not in output and 'scraper_version' not in output:
print(f'Data model directory {dir} had changes to the following files without a corresponding update to the spec SHA')
print(output)
print("Note that the data_model directory files are automatically updated by a spec scraper and should not be manually updated.")
return 1
return 0

ret = check_dir(clusters) + check_dir(device_types)
ret = check_dir(dir)
sys.exit(ret)


Expand Down
Loading