diff --git a/.mokogitea/workflows/pr-check.yml b/.mokogitea/workflows/pr-check.yml index 004a22a..d34108c 100644 --- a/.mokogitea/workflows/pr-check.yml +++ b/.mokogitea/workflows/pr-check.yml @@ -4,8 +4,8 @@ # # FILE INFORMATION # DEFGROUP: Gitea.Workflow -# INGROUP: mokoplatform.CI -# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/mokoplatform +# INGROUP: moko-platform.CI +# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform # PATH: /templates/workflows/universal/pr-check.yml.template # VERSION: 09.23.00 # BRIEF: PR gate — branch policy + code validation before merge @@ -185,11 +185,11 @@ jobs: echo "::error file=${file}::Missing JEXEC guard: ${file}" ERRORS=$((ERRORS + 1)) fi - done < <(find . -name "*.php" \( -path "*/source/*" -o -path "*/src/*" \) -not -path "./.git/*" -not -path "./vendor/*" -print0) + done < <(find . -name "*.php" -path "*/src/*" -not -path "./.git/*" -not -path "./vendor/*" -print0) if [ "$ERRORS" -gt 0 ]; then echo "::error::${ERRORS} PHP file(s) missing defined('_JEXEC') or die guard" echo "## JEXEC Guard Check: Failed" >> $GITHUB_STEP_SUMMARY - echo "${ERRORS} file(s) are missing the Joomla execution guard." >> $GITHUB_STEP_SUMMARY + echo "${ERRORS} file(s) in src/ are missing the Joomla execution guard." >> $GITHUB_STEP_SUMMARY exit 1 fi echo "JEXEC guard: OK" @@ -198,8 +198,7 @@ jobs: if: steps.platform.outputs.platform == 'joomla' run: | MISSING=0 - SOURCE_DIR="source" - [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="src" + SOURCE_DIR="src" [ ! -d "$SOURCE_DIR" ] && exit 0 while IFS= read -r dir; do if [ ! -f "${dir}/index.html" ]; then @@ -247,7 +246,7 @@ jobs: echo "joomla.asset.json: valid" fi - # Validate all XML files in source/src are well-formed + # Validate all XML files in src/ are well-formed XML_ERRORS=0 if command -v php &> /dev/null; then while IFS= read -r -d '' xmlfile; do @@ -478,11 +477,10 @@ jobs: - name: Verify package source run: | - SOURCE_DIR="source" - [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="src" + SOURCE_DIR="src" [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs" if [ ! -d "$SOURCE_DIR" ]; then - echo "::warning::No source/, src/, or htdocs/ directory" + echo "::warning::No src/ or htdocs/ directory" exit 0 fi FILE_COUNT=$(find "$SOURCE_DIR" -type f | wc -l)