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

Sgmoore/kde neon ext updates #4299

Merged
merged 9 commits into from
Aug 23, 2023
Merged

Sgmoore/kde neon ext updates #4299

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8389da6
kde-neon-extension: new content pack, ensure XDG_CONFIG_HOME is set s…
ScarlettGatelyMoore Jul 16, 2023
c4a5d54
kde-neon-extension: new content pack, ensure XDG_CONFIG_HOME is set s…
ScarlettGatelyMoore Jul 16, 2023
5e833dd
Merge branch 'main' into sgmoore/kde-neon-ext-updates
ScarlettGatelyMoore Jul 31, 2023
999e99b
kde-neon-extension: fix lint black formatting.
ScarlettGatelyMoore Jul 31, 2023
8f12961
kde-neon-extension: fix build env test
ScarlettGatelyMoore Jul 31, 2023
94cab66
kde-neon-extension. Remove the build enviroment change and move it to…
ScarlettGatelyMoore Aug 2, 2023
df4c576
kde-neon-extension: fix spread test
ScarlettGatelyMoore Aug 2, 2023
e104336
Merge branch 'main' into sgmoore/kde-neon-ext-updates
sergiusens Aug 4, 2023
bf9238d
Merge branch 'main' into sgmoore/kde-neon-ext-updates
lengau Aug 11, 2023
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
2 changes: 1 addition & 1 deletion snapcraft/extensions/kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

from .extension import Extension, get_extensions_data_dir, prepend_to_env

_SDK_SNAP = {"core22": "kf5-5-105-qt-5-15-9-core22-sdk"}
_SDK_SNAP = {"core22": "kf5-5-108-qt-5-15-10-core22-sdk"}


@dataclasses.dataclass
Expand Down
2 changes: 1 addition & 1 deletion tests/spread/extensions/kde-neon/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ execute: |
if [[ "$SPREAD_SYSTEM" =~ ubuntu-20.04 ]]; then
snap list kde-frameworks-5-99-qt-5-15-7-core20
elif [[ "$SPREAD_SYSTEM" =~ ubuntu-22.04 ]]; then
snap list kf5-5-105-qt-5-15-9-core22
snap list kf5-5-108-qt-5-15-10-core22
fi


Expand Down
38 changes: 20 additions & 18 deletions tests/unit/extensions/test_kde_neon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def kde_neon_extension_with_build_snap():
"base": "core22",
"parts": {
"part1": {
"build-snaps": ["kf5-5-105-qt-5-15-9-core22-sdk/latest/stable"]
"build-snaps": ["kf5-5-108-qt-5-15-10-core22-sdk/latest/stable"]
}
},
},
Expand All @@ -53,7 +53,9 @@ def kde_neon_extension_with_default_build_snap_from_latest_edge():
yaml_data={
"base": "core22",
"parts": {
"part1": {"build-snaps": ["kf5-5-105-qt-5-15-9-core22-sdk/latest/edge"]}
"part1": {
"build-snaps": ["kf5-5-108-qt-5-15-10-core22-sdk/latest/edge"]
sergiusens marked this conversation as resolved.
Show resolved Hide resolved
}
},
},
arch="amd64",
Expand Down Expand Up @@ -109,10 +111,10 @@ def test_get_root_snippet(kde_neon_extension):
"target": "$SNAP/data-dir/sounds",
"default-provider": "gtk-common-themes",
},
"kf5-5-105-qt-5-15-9-core22": {
"content": "kf5-5-105-qt-5-15-9-core22-all",
"kf5-5-108-qt-5-15-10-core22": {
"content": "kf5-5-108-qt-5-15-10-core22-all",
"interface": "content",
"default-provider": "kf5-5-105-qt-5-15-9-core22",
"default-provider": "kf5-5-108-qt-5-15-10-core22",
"target": "$SNAP/kf5",
},
},
Expand Down Expand Up @@ -143,10 +145,10 @@ def test_get_root_snippet_with_external_sdk(kde_neon_extension_with_build_snap):
"target": "$SNAP/data-dir/sounds",
"default-provider": "gtk-common-themes",
},
"kf5-5-105-qt-5-15-9-core22": {
"content": "kf5-5-105-qt-5-15-9-core22-all",
"kf5-5-108-qt-5-15-10-core22": {
"content": "kf5-5-108-qt-5-15-10-core22-all",
"interface": "content",
"default-provider": "kf5-5-105-qt-5-15-9-core22",
"default-provider": "kf5-5-108-qt-5-15-10-core22",
"target": "$SNAP/kf5",
},
},
Expand All @@ -172,19 +174,19 @@ def assert_get_part_snippet(kde_neon_instance):
"build-environment": [
{
"PATH": (
"/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/usr/bin${PATH:+:$PATH}"
"/snap/kf5-5-108-qt-5-15-10-core22-sdk/current/usr/bin${PATH:+:$PATH}"
)
},
{
"XDG_DATA_DIRS": (
"$CRAFT_STAGE/usr/share:/snap/kf5-5-105-qt-5-15-9-core22-sdk"
"$CRAFT_STAGE/usr/share:/snap/kf5-5-108-qt-5-15-10-core22-sdk"
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
"/snap/kf5-5-105-qt-5-15-9-core22-sdk/current"
"/snap/kf5-5-108-qt-5-15-10-core22-sdk/current"
"${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
)
},
Expand All @@ -197,20 +199,20 @@ def test_get_part_snippet_with_external_sdk(kde_neon_extension_with_build_snap):
"build-environment": [
{
"PATH": (
"/snap/kf5-5-105-qt-5-15-9-core22-sdk/current/"
"/snap/kf5-5-108-qt-5-15-10-core22-sdk/current/"
"usr/bin${PATH:+:$PATH}"
)
},
{
"XDG_DATA_DIRS": (
"$CRAFT_STAGE/usr/share:/snap/kf5-5-105-qt-5-15-9-core22-sdk"
"$CRAFT_STAGE/usr/share:/snap/kf5-5-108-qt-5-15-10-core22-sdk"
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
"/snap/kf5-5-105-qt-5-15-9-core22-sdk/current"
"/snap/kf5-5-108-qt-5-15-10-core22-sdk/current"
"${SNAPCRAFT_CMAKE_ARGS:+:$SNAPCRAFT_CMAKE_ARGS}"
)
},
Expand All @@ -225,8 +227,8 @@ def test_get_parts_snippet(kde_neon_extension):
"kde-neon/sdk": {
"source": str(source),
"plugin": "make",
"make-parameters": ["PLATFORM_PLUG=kf5-5-105-qt-5-15-9-core22"],
"build-snaps": ["kf5-5-105-qt-5-15-9-core22-sdk"],
"make-parameters": ["PLATFORM_PLUG=kf5-5-108-qt-5-15-10-core22"],
"build-snaps": ["kf5-5-108-qt-5-15-10-core22-sdk"],
}
}

Expand All @@ -238,7 +240,7 @@ def test_get_parts_snippet_with_external_sdk(kde_neon_extension_with_build_snap)
"kde-neon/sdk": {
"source": str(source),
"plugin": "make",
"make-parameters": ["PLATFORM_PLUG=kf5-5-105-qt-5-15-9-core22"],
"make-parameters": ["PLATFORM_PLUG=kf5-5-108-qt-5-15-10-core22"],
}
}

Expand All @@ -253,7 +255,7 @@ def test_get_parts_snippet_with_external_sdk_different_channel(
"kde-neon/sdk": {
"source": str(source),
"plugin": "make",
"make-parameters": ["PLATFORM_PLUG=kf5-5-105-qt-5-15-9-core22"],
"make-parameters": ["PLATFORM_PLUG=kf5-5-108-qt-5-15-10-core22"],
}
}
)