Skip to content

Commit

Permalink
kde extension: new content snap for core20 (#3846)
Browse files Browse the repository at this point in the history
Co-authored-by: Sergio Schvezov <[email protected]>
  • Loading branch information
ppd and sergiusens authored Aug 22, 2022
1 parent 3a5ad3f commit fc8dc89
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
build_snaps=["kde-frameworks-5-core18-sdk/latest/stable"],
),
core20=_ExtensionInfo(
cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current",
content="kde-frameworks-5-91-qt-5-15-3-core20-all",
provider="kde-frameworks-5-91-qt-5-15-3-core20",
build_snaps=["kde-frameworks-5-91-qt-5-15-3-core20-sdk/latest/stable"],
cmake_args="-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-96-qt-5-15-5-core20-sdk/current",
content="kde-frameworks-5-96-qt-5-15-5-core20-all",
provider="kde-frameworks-5-96-qt-5-15-5-core20",
build_snaps=["kde-frameworks-5-96-qt-5-15-5-core20-sdk/latest/stable"],
),
)

Expand Down
12 changes: 6 additions & 6 deletions tests/legacy/unit/project_loader/extensions/test_kde_neon.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ def test_extension_core20():
"interface": "content",
"target": "$SNAP/data-dir/icons",
},
"kde-frameworks-5-91-qt-5-15-3-core20": {
"content": "kde-frameworks-5-91-qt-5-15-3-core20-all",
"default-provider": "kde-frameworks-5-91-qt-5-15-3-core20",
"kde-frameworks-5-96-qt-5-15-5-core20": {
"content": "kde-frameworks-5-96-qt-5-15-5-core20-all",
"default-provider": "kde-frameworks-5-96-qt-5-15-5-core20",
"interface": "content",
"target": "$SNAP/kf5",
},
Expand All @@ -113,15 +113,15 @@ def test_extension_core20():
assert kde_neon_extension.part_snippet == {
"build-environment": [
{
"SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-91-qt-5-15-3-core20-sdk/current"
"SNAPCRAFT_CMAKE_ARGS": "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-96-qt-5-15-5-core20-sdk/current"
}
]
}
assert kde_neon_extension.parts == {
"kde-neon-extension": {
"build-packages": ["g++"],
"build-snaps": ["kde-frameworks-5-91-qt-5-15-3-core20-sdk/latest/stable"],
"make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-91-qt-5-15-3-core20"],
"build-snaps": ["kde-frameworks-5-96-qt-5-15-5-core20-sdk/latest/stable"],
"make-parameters": ["PLATFORM_PLUG=kde-frameworks-5-96-qt-5-15-5-core20"],
"plugin": "make",
"source": "$SNAPCRAFT_EXTENSIONS_DIR/desktop",
"source-subdir": "kde-neon",
Expand Down

0 comments on commit fc8dc89

Please sign in to comment.