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.

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

Plugins: Enable qmake for core22 #4162

Merged
merged 24 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
acc4d02
Plugins: Enable qmake for core22
ScarlettGatelyMoore May 19, 2023
0d0d0d9
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore May 22, 2023
bfa37ac
Update tests/spread/plugins/craft-parts/build-and-run-hello/qmake-hel…
ScarlettGatelyMoore May 22, 2023
a173e08
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
1eb710c
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
0ab21d1
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
41f682d
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
747f2a6
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
e751745
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
466e74b
Update snapcraft/parts/plugins/qmake.py
ScarlettGatelyMoore May 22, 2023
d3ef2e3
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore May 23, 2023
da7f19a
Remove qmake plugin as it is now in craft-parts.
ScarlettGatelyMoore May 24, 2023
91d398b
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore May 30, 2023
b778dc4
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore Jun 2, 2023
d3b9e2a
kde-neon-extension: only test core22. core18 and core20 is no longer …
ScarlettGatelyMoore May 30, 2023
cd79fbf
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore Jun 5, 2023
d90a30f
Merge branch 'main' into sgmoore/update_qmake_plugin
lengau Jun 7, 2023
2116aeb
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore Jun 8, 2023
ce62323
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore Jun 12, 2023
f2cd7d3
Merge branch 'main' into sgmoore/update_qmake_plugin
ScarlettGatelyMoore Sep 27, 2023
67f0117
Merge branch 'main' into sgmoore/update_qmake_plugin
lengau Oct 22, 2023
c9d882a
Merge branch 'main' into sgmoore/update_qmake_plugin
lengau Feb 29, 2024
aa98fc5
Merge branch 'main' into sgmoore/update_qmake_plugin
lengau Feb 29, 2024
494ea32
Merge branch 'main' into sgmoore/update_qmake_plugin
lengau Mar 8, 2024
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
4 changes: 0 additions & 4 deletions tests/spread/extensions/kde-neon/task.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ summary: Build and run a basic kde snap using extensions
# available on a subset of all the architectures this testbed
# can run on.
systems:
- ubuntu-20.04
- ubuntu-20.04-64
- ubuntu-20.04-amd64
- ubuntu-22.04
- ubuntu-22.04-64
- ubuntu-22.04-amd64
Expand Down Expand Up @@ -51,7 +48,6 @@ execute: |
snap list kf5-5-113-qt-5-15-11-core22
fi


# Verify all dependencies were found.
if echo "$output" | grep -q "part is missing libraries"; then
echo "failed to find content snaps' libraries"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include <stdio.h>

int main()
{
printf("hello world\n");
return 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CONFIG = console release
SOURCES += hello.c
target.path = /bin/
INSTALLS += target
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: qmake-hello
version: "1.0"
summary: test the qmake plugin
description: |
This is a basic qmake snap. It just prints a hello world.
If you want to add other functionalities to this snap, please don't.
Make a new one.

grade: devel
base: core22
confinement: strict

apps:
qmake-hello:
command: bin/hello

parts:
hello:
plugin: qmake
qmake-parameters:
- -Wall
source: .
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ environment:
SNAP/colcon_ros2_wrapper: colcon-ros2-wrapper
SNAP/flutter: flutter-hello
SNAP/python: python-hello
SNAP/qmake: qmake-hello

prepare: |
#shellcheck source=tests/spread/tools/snapcraft-yaml.sh
Expand Down
Loading