Skip to content

Commit cd6e284

Browse files
Merge pull request #856 from ArmDeveloperEcosystem/fix/ci-linux-content-paths
fix(ci): restore build after linux content re-org
2 parents d9d7cca + 73b688c commit cd6e284

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

build_steps/update_recently_added_json.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
script_dir = Path(__file__).parent.absolute()
99

1010
# Relative path to content from script, then tet absolute path to content by combining, and use Resolve to handle backwards".."
11-
opensource_relative_path = Path('../content/opensource_packages')
11+
opensource_relative_path = Path('../content/linux/opensource_packages')
1212
opensource_absolute_path = (script_dir / opensource_relative_path).resolve()
1313

14-
commercial_relative_path = Path('../content/commercial_packages')
14+
commercial_relative_path = Path('../content/linux/commercial_packages')
1515
commercial_absolute_path = (script_dir / commercial_relative_path).resolve()
1616

1717
# Same process for the YAML data file:
@@ -29,8 +29,8 @@ def get_all_package_metadata(package_path):
2929
metadata_dic = yaml.safe_load(metadata)
3030
# Add another dictionary key in addition to Params that is the File path to support GitHub editing functionality
3131
unused, file_name = os.path.split(package_path)
32-
last_directory_name = os.path.basename(os.path.dirname(package_path))
33-
file_path = os.path.join(last_directory_name,file_name).replace("\\", "/")
32+
content_root = (script_dir / "../content").resolve()
33+
file_path = str(Path(package_path).resolve().relative_to(content_root)).replace("\\", "/")
3434
metadata_mirror_hugo_page = {
3535
"Params": metadata_dic,
3636
"File": {"Path": file_path}

build_steps/validate_package_catagories.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ def isCategoryValid(string, dictionary):
2323

2424

2525
# content dirs
26-
opensource_relative_path = Path('../content/opensource_packages')
26+
opensource_relative_path = Path('../content/linux/opensource_packages')
2727
opensource_absolute_path = (script_dir / opensource_relative_path).resolve()
2828

29-
commercial_relative_path = Path('../content/commercial_packages')
29+
commercial_relative_path = Path('../content/linux/commercial_packages')
3030
commercial_absolute_path = (script_dir / commercial_relative_path).resolve()
3131

3232
content_directories = [opensource_absolute_path, commercial_absolute_path]

content/linux/opensource_packages/gitbook.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ download_url: https://github.com/GitbookIO/gitbook.git
66
works_on_arm: true
77
supported_minimum_version:
88
version_number:
9-
release_date: 2024/11/05 (Main branch)
9+
release_date: 2024/11/05
1010

1111

1212
optional_info:

content/linux/opensource_packages/stream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ download_url: https://github.com/jeffhammond/STREAM.git
66
works_on_arm: true
77
supported_minimum_version:
88
version_number:
9-
release_date: Master branch (2023/07/28)
9+
release_date: 2023/07/28
1010

1111

1212
optional_info:

0 commit comments

Comments
 (0)