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

Keep the owner:group of the one downloading the tarball #2303

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions .github/jobs/configure-checks/all.bats
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@ compile_assertions_finished () {
assert_line " * judgehost...........: /opt/domjudge/judgehost"
assert_line " * runguard group......: domjudge-run"
run make domserver
assert_line "SOmething builds"
assert_success
run make judgehost
assert_success
Expand Down
13 changes: 9 additions & 4 deletions .github/jobs/configure-checks/setup_configure_image.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
#!/bin/sh
#!/bin/bash

set -eux

distro_id=$(grep "^ID=" /etc/os-release)

# Install everything for configure and testing
shared="pkg-config make rst2pdf autoconf composer bats latexmk"
shared2="$shared python3-{yaml,sphinx} php{,-{fpm,gd,cli,intl,mbstrin,mysql,curl,jsonxml,zip}

case $distro_id in
"ID=fedora")
dnf install pkg-config make bats autoconf automake util-linux -y ;;
dnf install $shared automake util-linux \
python3-sphinx_rtd_theme texlive-cmap -y ;;
*)
apt-get update; apt-get full-upgrade -y
apt-get install pkg-config make bats autoconf -y ;;
apt-get install $shared \
python3-sphinx-rtd-theme texlive-latex-{recommended,extra} tex-gyre -y ;;
esac

# Build the configure file
make configure
make dist

# Install extra assert statements for bots
cp submit/assert.bash .github/jobs/configure-checks/
Expand Down
21 changes: 12 additions & 9 deletions webapp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/Makefile.global
# Subdirectories to recurse into for REC_TARGETS
SUBDIRS = config

domserver: composer-dump-autoload
domserver: composer-dump-autoload public/bundles/nelmioapidoc

# Install PHP dependencies
composer-dependencies:
Expand Down Expand Up @@ -43,20 +43,19 @@ composer-dump-autoload-dev:
@echo "# the DOMjudge Symfony application in developer mode. Adjust as needed." >> $@
@echo "APP_ENV=dev" >> $@

copy-bundle-assets:
public/bundles/nelmioapidoc:
# We can not use bin/console here, as when using a fakeroot,
# the include paths are broken. We just copy in the data we need
-rm -rf public/bundles/nelmioapidoc
mkdir -p public/bundles/nelmioapidoc
cp -R vendor/nelmio/api-doc-bundle/public/* public/bundles/nelmioapidoc/
mkdir -p $@
cp -a vendor/nelmio/api-doc-bundle/public/* $@

clean-l:
-rm -rf public/bundles/nelmioapidoc
-rm -f vendor/autoload_runtime.php

domserver-l: public/bundles/nelmioapidoc

install-domserver:
# This must be done first to install with the rest.
$(MAKE) copy-bundle-assets
$(INSTALL_DIR) $(DESTDIR)$(domserver_webappdir);
for d in bin config migrations public resources src templates tests vendor; do \
$(call install_tree,$(DESTDIR)$(domserver_webappdir),$$d) ; \
Expand All @@ -79,12 +78,16 @@ maintainer-conf: .env.local

maintainer-install: composer-dump-autoload-dev

maintainer-install-l:
# This must be done first to install with the rest.
-rm -rf public/bundles/nelmioapidoc
$(MAKE) public/bundles/nelmioapidoc

maintainer-clean-l:
-for d in cache log ; do \
for t in dev prod ; do \
rm -rf var/$$d/$$t ; \
done ; \
done

.PHONY: composer-dump-autoload composer-dump-autoload-dev \
copy-bundle-assets
.PHONY: composer-dump-autoload composer-dump-autoload-dev
Loading