From f4a80c1a01501b2d98f2e64c5d90991b6ed462a5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 10 Sep 2023 22:15:02 +0200 Subject: [PATCH] Docs: deal with variations between Docker images --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85ea8308d..c8d2081dc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -79,7 +79,7 @@ Pick one (or both): - `docker pull kdeneon/plasma:user` Then start a container with the right image, from the root of Calamares -source checkout: +source checkout. Pick one: - `docker run -ti --tmpfs /build:rw --user 0:0 -v .:/src opensuse/tumbleweed ` - `docker run -ti --tmpfs /build:rw --user 0:0 -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=:0 -v .:/src kdeneon/plasma:user bash` This starts a container with the chosen image (openSUSE Tumbleweed or KDE neon, @@ -90,6 +90,7 @@ starting a complete desktop. Run the script to install dependencies: you could use `deploycala.py` or one of the shell scripts in `.github/workflows` to install the right dependencies for the image. +- `cd /src` - `./.github/workflows/nightly-opensuse-qt6.sh` Then run CMake (add any CMake options you like at the end) and ninja: