diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ab79757..048b3718 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -314,6 +314,7 @@ opensuse mingw64 meson debug: extends: - .meson-common - .suse-build + when: manual variables: ci_host: "x86_64-w64-mingw32" ci_local_packages: "no" diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 2afcd789..8abbc6d0 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -173,7 +173,9 @@ case "$ci_distro" in if [ "$ci_in_docker" = yes ]; then # Add the user that we will use to do the build inside the # Docker container, and let them use sudo - adduser --disabled-password --gecos "" user + if ! getent passwd user > /dev/null; then + adduser --disabled-password --gecos "" user + fi echo "user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopasswd chmod 0440 /etc/sudoers.d/nopasswd fi