Skip to content

Commit

Permalink
kde-neon-extension. Remove the build enviroment change and move it to…
Browse files Browse the repository at this point in the history
… a seperate PR
  • Loading branch information
ScarlettGatelyMoore committed Aug 2, 2023
1 parent 8f12961 commit 94cab66
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
9 changes: 0 additions & 9 deletions snapcraft/extensions/kde_neon.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,6 @@ def get_part_snippet(self, *, plugin_name: str) -> Dict[str, Any]:
],
),
},
{
"XDG_CONFIG_HOME": prepend_to_env(
"XDG_CONFIG_HOME",
[
f" $CRAFT_STAGE/etc/xdg:/snap/{sdk_snap}/current/etc/xdg",
"/etc/xdg",
],
),
},
{
"SNAPCRAFT_CMAKE_ARGS": prepend_to_env(
"SNAPCRAFT_CMAKE_ARGS",
Expand Down
12 changes: 0 additions & 12 deletions tests/unit/extensions/test_kde_neon.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,6 @@ def assert_get_part_snippet(kde_neon_instance):
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
},
{
"XDG_CONFIG_HOME": (
"$CRAFT_STAGE/etc/xdg:/snap/kf5-5-108-qt-5-15-10-core22-sdk"
"/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}"
)
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
Expand All @@ -215,12 +209,6 @@ def test_get_part_snippet_with_external_sdk(kde_neon_extension_with_build_snap):
"/current/usr/share:/usr/share${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
)
},
{
"XDG_CONFIG_HOME": (
"$CRAFT_STAGE/etc/xdg:/snap/kf5-5-108-qt-5-15-10-core22-sdk"
"/current/etc/xdg:/etc/xdg${XDG_CONFIG_HOME:+:$XDG_CONFIG_HOME}"
)
},
{
"SNAPCRAFT_CMAKE_ARGS": (
"-DCMAKE_FIND_ROOT_PATH="
Expand Down

0 comments on commit 94cab66

Please sign in to comment.