From c8685b85c2a12faf1b51b5709865a18bb4de00a7 Mon Sep 17 00:00:00 2001 From: Michael Vasseur <14887731+vmcj@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:22:45 +0100 Subject: [PATCH] Keep the owner:group of the one downloading the tarball In the scenario: ./configure --prefix= make domserver sudo make-installdomserver We would copy the Nelmiodoc files as root, so the user can't run a make {dist}clean without errors as we can't remove the folder as its owned by root. We now also install nelmiodoc together with composer in the base image for CI: - together with the needed dependencies - make sure we get an autoload.php See https://github.com/DOMjudge/domjudge/pull/2303#discussion_r1493469404 for the reasoning behind this. --- .github/jobs/configure-checks/setup_configure_image.sh | 3 +-- webapp/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/jobs/configure-checks/setup_configure_image.sh b/.github/jobs/configure-checks/setup_configure_image.sh index e1c84f8b74..9c721d2435 100755 --- a/.github/jobs/configure-checks/setup_configure_image.sh +++ b/.github/jobs/configure-checks/setup_configure_image.sh @@ -12,8 +12,7 @@ case $distro_id in apt-get update; apt-get full-upgrade -y apt-get install pkg-config make bats autoconf -y apt-get install composer php php-cli php-curl php-fpm php-gd \ - php-intl php-json php-mbstring php-mysql php-xml php-zip -y - ;; + php-intl php-json php-mbstring php-mysql php-xml php-zip -y ;; esac # Build the configure file diff --git a/webapp/Makefile b/webapp/Makefile index 458b1526d1..c793f8084a 100644 --- a/webapp/Makefile +++ b/webapp/Makefile @@ -50,6 +50,10 @@ public/bundles/nelmioapidoc: mkdir -p $@ cp -a vendor/nelmio/api-doc-bundle/public/* $@ +# -rm -rf public/bundles/nelmioapidoc +# mkdir -p public/bundles/nelmioapidoc +# cp -a vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/ + clean-l: -rm -rf public/bundles/nelmioapidoc -rm -f vendor/autoload_runtime.php