Skip to content

fix(Makefile): add support for apps requiring composer with --no-scri… #94

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.

Sign up for GitHub

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

Merged
printminion-co merged 1 commit into from
Dec 12, 2025
Merged

fix(Makefile): add support for apps requiring composer with --no-scri… #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 29 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ COMPOSER_ONLY_APPS = \
# App directories that need only composer but with --no-scripts (to avoid dev-only composer script issues)
# These apps have @composer bin commands in post-install-cmd but the bamarni/composer-bin-plugin
# is only in require-dev, so it fails when running with --no-dev
COMPOSER_NO_SCRIPTS_APPS = \
# Intentionally left empty: currently, no apps require composer with --no-scripts only.
COMPOSER_NO_SCRIPTS_APPS =
Comment on lines +60 to +61
Copy link

Copilot AI Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The variable COMPOSER_NO_SCRIPTS_APPS is now empty and appears to have no apps assigned to it. If this category is truly no longer needed, consider removing the variable definition and all related build targets/rules to avoid maintaining unused code. Alternatively, if this is temporary, the comment should clarify the expected future state.

Copilot uses AI. Check for mistakes.

# App directories that need composer with --no-scripts AND npm build
# These apps have composer script issues with --no-dev but still need npm build
COMPOSER_NO_SCRIPTS_WITH_NPM_APPS = \
forms \
password_policy \
twofactor_totp
Expand All @@ -77,6 +82,7 @@ REMOVE_UNWANTED_APPS = $(shell [ -f IONOS/removed-apps.txt ] && sed '/^#/d;/^$$/
FULL_BUILD_TARGETS = $(patsubst %,build_%_app,$(FULL_BUILD_APPS))
COMPOSER_ONLY_TARGETS = $(patsubst %,build_%_app,$(COMPOSER_ONLY_APPS))
COMPOSER_NO_SCRIPTS_TARGETS = $(patsubst %,build_%_app,$(COMPOSER_NO_SCRIPTS_APPS))
COMPOSER_NO_SCRIPTS_WITH_NPM_TARGETS = $(patsubst %,build_%_app,$(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS))
NOTHING_TO_BUILD_TARGETS = $(patsubst %,build_%_app,$(NOTHING_TO_BUILD_APPS))
SPECIAL_BUILD_TARGETS = $(patsubst %,build_%_app,$(SPECIAL_BUILD_APPS))

Expand All @@ -85,7 +91,7 @@ SPECIAL_BUILD_TARGETS = $(patsubst %,build_%_app,$(SPECIAL_BUILD_APPS))
# Main Nextcloud build
.PHONY: build_ncw
# Applications - dynamically generated
.PHONY: build_all_external_apps build_notify_push_binary build_core_app_theming $(FULL_BUILD_TARGETS) $(COMPOSER_ONLY_TARGETS) $(COMPOSER_NO_SCRIPTS_TARGETS) $(NOTHING_TO_BUILD_TARGETS) $(SPECIAL_BUILD_TARGETS)
.PHONY: build_all_external_apps build_notify_push_binary build_core_app_theming $(FULL_BUILD_TARGETS) $(COMPOSER_ONLY_TARGETS) $(COMPOSER_NO_SCRIPTS_TARGETS) $(COMPOSER_NO_SCRIPTS_WITH_NPM_TARGETS) $(NOTHING_TO_BUILD_TARGETS) $(SPECIAL_BUILD_TARGETS)
# Configuration and packaging
.PHONY: add_config_partials patch_shipped_json version.json zip_dependencies
# Pipeline targets for GitLab workflow
Expand All @@ -110,6 +116,8 @@ help: ## This help.
@for app in $(COMPOSER_ONLY_APPS); do printf "\033[36m%-30s\033[0m Build $$app app (composer only)\n" "build_$${app}_app"; done
@echo " Composer-only apps (no scripts):"
@for app in $(COMPOSER_NO_SCRIPTS_APPS); do printf "\033[36m%-30s\033[0m Build $$app app (composer no scripts)\n" "build_$${app}_app"; done
@echo " Composer (no scripts) + npm build apps:"
@for app in $(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS); do printf "\033[36m%-30s\033[0m Build $$app app (composer no scripts + npm)\n" "build_$${app}_app"; done
@echo " Nothing to build apps:"
@for app in $(NOTHING_TO_BUILD_APPS); do printf "\033[36m%-30s\033[0m Nothing to build for $$app app\n" "build_$${app}_app"; done
@echo ""
Expand Down Expand Up @@ -191,6 +199,16 @@ define build_composer_no_scripts_app
@echo "[✓] $(1) app built successfully"
endef

# Common function to build apps with composer (no scripts) plus npm build
define build_composer_no_scripts_with_npm_app
@echo "[i] Building $(1) app (no scripts + npm)..."
@cd apps-external/$(1) && \
composer install --no-dev -o --no-interaction --no-scripts && \
$(NPM_INSTALL) && \
$(NPM_BUILD)
@echo "[✓] $(1) app built successfully"
endef

build_core_app_theming: .precheck ## Build theming app
@echo "[i] Building theming app..."
cd apps/theming/composer && \
Expand All @@ -215,6 +233,10 @@ $(COMPOSER_ONLY_TARGETS): build_%_app:
$(COMPOSER_NO_SCRIPTS_TARGETS): build_%_app:
$(call build_composer_no_scripts_app,$(patsubst build_%_app,%,$@))

# Dynamic rules for composer-only apps with --no-scripts plus npm build
$(COMPOSER_NO_SCRIPTS_WITH_NPM_TARGETS): build_%_app:
$(call build_composer_no_scripts_with_npm_app,$(patsubst build_%_app,%,$@))

# Dynamic rules for apps with nothing to build
$(NOTHING_TO_BUILD_TARGETS): build_%_app:
@echo "[i] Nothing to build for $$(patsubst build_%_app,%,$@) app"
Expand Down Expand Up @@ -315,7 +337,7 @@ zip_dependencies: patch_shipped_json version.json ## Zip relevant files
@echo "[i] Package $(TARGET_PACKAGE_NAME) created successfully"

# Parallel build targets
build_all_external_apps: $(FULL_BUILD_TARGETS) $(COMPOSER_ONLY_TARGETS) $(COMPOSER_NO_SCRIPTS_TARGETS) $(NOTHING_TO_BUILD_TARGETS) $(SPECIAL_BUILD_TARGETS) ## Build all external apps
build_all_external_apps: $(FULL_BUILD_TARGETS) $(COMPOSER_ONLY_TARGETS) $(COMPOSER_NO_SCRIPTS_TARGETS) $(COMPOSER_NO_SCRIPTS_WITH_NPM_TARGETS) $(NOTHING_TO_BUILD_TARGETS) $(SPECIAL_BUILD_TARGETS) ## Build all external apps
@echo "[i] All external apps built successfully"

build_after_external_apps: build_ncw add_config_partials ## Build NCW and add configs after external apps are done
Expand All @@ -342,6 +364,7 @@ validate_external_apps: .precheck ## Validate and suggest proper categorization
"$(FULL_BUILD_APPS)" \
"$(COMPOSER_ONLY_APPS)" \
"$(COMPOSER_NO_SCRIPTS_APPS)" \
"$(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS)" \
"$(NOTHING_TO_BUILD_APPS)" \
"$(SPECIAL_BUILD_APPS)"

Expand All @@ -350,6 +373,7 @@ validate_app_list_uniqueness: .precheck ## Validate that apps are only in one li
"$(FULL_BUILD_APPS)" \
"$(COMPOSER_ONLY_APPS)" \
"$(COMPOSER_NO_SCRIPTS_APPS)" \
"$(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS)" \
"$(NOTHING_TO_BUILD_APPS)" \
"$(SPECIAL_BUILD_APPS)" \
"$(MAKEFILE_LIST)"
Expand All @@ -365,7 +389,7 @@ generate_external_apps_matrix: .precheck ## Generate external-apps-matrix.yml fi
@echo "apps-external:"
@bash -c ' \
# Process all configured apps \
all_configured_apps="$(FULL_BUILD_APPS) $(COMPOSER_ONLY_APPS) $(COMPOSER_NO_SCRIPTS_APPS) $(NOTHING_TO_BUILD_APPS) $(SPECIAL_BUILD_APPS)"; \
all_configured_apps="$(FULL_BUILD_APPS) $(COMPOSER_ONLY_APPS) $(COMPOSER_NO_SCRIPTS_APPS) $(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS) $(NOTHING_TO_BUILD_APPS) $(SPECIAL_BUILD_APPS)"; \
# Sort apps alphabetically \
sorted_apps=$$(echo $$all_configured_apps | tr " " "\n" | sort | tr "\n" " "); \
for app in $$sorted_apps; do \
Expand Down Expand Up @@ -398,7 +422,7 @@ generate_external_apps_matrix_json: .precheck ## Generate external-apps-matrix.j
@echo "[i] Generating external apps matrix JSON file..." >&2
@bash -c ' \
# Process all configured apps \
all_configured_apps="$(FULL_BUILD_APPS) $(COMPOSER_ONLY_APPS) $(COMPOSER_NO_SCRIPTS_APPS) $(NOTHING_TO_BUILD_APPS) $(SPECIAL_BUILD_APPS)"; \
all_configured_apps="$(FULL_BUILD_APPS) $(COMPOSER_ONLY_APPS) $(COMPOSER_NO_SCRIPTS_APPS) $(COMPOSER_NO_SCRIPTS_WITH_NPM_APPS) $(NOTHING_TO_BUILD_APPS) $(SPECIAL_BUILD_APPS)"; \
echo "["; \
first=true; \
found_any=false; \
Expand Down
84 changes: 48 additions & 36 deletions scripts/validate_app_list_uniqueness.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@
set -euo pipefail

# This script validates that apps are only in one list and not duplicated by hardcoded targets
# Arguments: FULL_BUILD_APPS COMPOSER_ONLY_APPS COMPOSER_NO_SCRIPTS_APPS NOTHING_TO_BUILD_APPS SPECIAL_BUILD_APPS MAKEFILE_PATH
# Arguments: FULL_BUILD_APPS COMPOSER_ONLY_APPS COMPOSER_NO_SCRIPTS_APPS COMPOSER_NO_SCRIPTS_WITH_NPM_APPS NOTHING_TO_BUILD_APPS SPECIAL_BUILD_APPS MAKEFILE_PATH

FULL_BUILD_APPS="$1"
COMPOSER_ONLY_APPS="$2"
COMPOSER_NO_SCRIPTS_APPS="$3"
NOTHING_TO_BUILD_APPS="$4"
SPECIAL_BUILD_APPS="$5"
MAKEFILE_PATH="$6"
COMPOSER_NO_SCRIPTS_WITH_NPM_APPS="$4"
NOTHING_TO_BUILD_APPS="$5"
SPECIAL_BUILD_APPS="$6"
MAKEFILE_PATH="$7"

echo "[i] Validating app list uniqueness..."

validation_failed=0

# Combine all apps into one list
all_apps="$FULL_BUILD_APPS $COMPOSER_ONLY_APPS $COMPOSER_NO_SCRIPTS_APPS $NOTHING_TO_BUILD_APPS $SPECIAL_BUILD_APPS"
all_apps="$FULL_BUILD_APPS $COMPOSER_ONLY_APPS $COMPOSER_NO_SCRIPTS_APPS $COMPOSER_NO_SCRIPTS_WITH_NPM_APPS $NOTHING_TO_BUILD_APPS $SPECIAL_BUILD_APPS"

echo "[i] Checking for duplicate apps across lists..."
echo ""
Expand Down Expand Up @@ -47,17 +48,26 @@ for app in $all_apps; do
fi
done

# Check COMPOSER_NO_SCRIPTS_APPS
for cns_app in $COMPOSER_NO_SCRIPTS_APPS; do
if [ "$app" = "$cns_app" ]; then
count=$((count + 1))
locations="$locations COMPOSER_NO_SCRIPTS_APPS"
break
fi
done

# Check NOTHING_TO_BUILD_APPS
for ntb_app in $NOTHING_TO_BUILD_APPS; do
# Check COMPOSER_NO_SCRIPTS_APPS
for cns_app in $COMPOSER_NO_SCRIPTS_APPS; do
if [ "$app" = "$cns_app" ]; then
count=$((count + 1))
locations="$locations COMPOSER_NO_SCRIPTS_APPS"
break
fi
done

# Check COMPOSER_NO_SCRIPTS_WITH_NPM_APPS
for cnswn_app in $COMPOSER_NO_SCRIPTS_WITH_NPM_APPS; do
if [ "$app" = "$cnswn_app" ]; then
count=$((count + 1))
locations="$locations COMPOSER_NO_SCRIPTS_WITH_NPM_APPS"
break
fi
done

# Check NOTHING_TO_BUILD_APPS
for ntb_app in $NOTHING_TO_BUILD_APPS; do
if [ "$app" = "$ntb_app" ]; then
count=$((count + 1))
locations="$locations NOTHING_TO_BUILD_APPS"
Expand Down Expand Up @@ -145,24 +155,26 @@ if [ $validation_failed -eq 0 ]; then
echo "✅ No hardcoded targets conflict with dynamic lists"
echo "✅ All special build apps have corresponding targets"
else
echo "❌ Validation failed - please fix the issues above"
echo ""
echo "📋 GUIDELINES:"
echo "1. Each app must appear in ONLY ONE of these lists:"
echo " - FULL_BUILD_APPS"
echo " - COMPOSER_ONLY_APPS"
echo " - COMPOSER_NO_SCRIPTS_APPS"
echo " - NOTHING_TO_BUILD_APPS"
echo " - SPECIAL_BUILD_APPS"
echo ""
echo "2. Apps in FULL_BUILD_APPS, COMPOSER_ONLY_APPS, COMPOSER_NO_SCRIPTS_APPS, and NOTHING_TO_BUILD_APPS"
echo " use dynamic build rules and should NOT have hardcoded build_<app>_app targets"
echo ""
echo "3. Apps in SPECIAL_BUILD_APPS require custom build logic and MUST have"
echo " a hardcoded build_<app>_app target in the Makefile"
echo ""
echo "4. Currently excluded from conflict checks (known special cases):"
echo " - notify_push (has both hardcoded target and SPECIAL_BUILD_APPS entry)"
echo " - theming (core app with special handling)"
exit 1
echo "❌ Validation failed - please fix the issues above"
echo ""
echo "📋 GUIDELINES:"
echo "1. Each app must appear in ONLY ONE of these lists:"
echo " - FULL_BUILD_APPS"
echo " - COMPOSER_ONLY_APPS"
echo " - COMPOSER_NO_SCRIPTS_APPS"
echo " - COMPOSER_NO_SCRIPTS_WITH_NPM_APPS"
echo " - NOTHING_TO_BUILD_APPS"
echo " - SPECIAL_BUILD_APPS"
echo ""
echo "2. Apps in FULL_BUILD_APPS, COMPOSER_ONLY_APPS, COMPOSER_NO_SCRIPTS_APPS,"
echo " COMPOSER_NO_SCRIPTS_WITH_NPM_APPS, and NOTHING_TO_BUILD_APPS"
echo " use dynamic build rules and should NOT have hardcoded build_<app>_app targets"
echo ""
echo "3. Apps in SPECIAL_BUILD_APPS require custom build logic and MUST have"
echo " a hardcoded build_<app>_app target in the Makefile"
echo ""
echo "4. Currently excluded from conflict checks (known special cases):"
echo " - notify_push (has both hardcoded target and SPECIAL_BUILD_APPS entry)"
echo " - theming (core app with special handling)"
exit 1
fi
Loading