Skip to content

Commit cac0e69

Browse files
committed
fix: use tail -1 in drush_ev to skip Drupal warnings on stdout, add apachesolr bundle config
1 parent a0da002 commit cac0e69

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

.github/scripts/solr9-cuj6-configure-server.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ step() { echo ""; echo ">>>>>>>>>> $1 <<<<<<<<<<"; echo ""; }
1212

1313
# Helper: run drush ev, suppress terminus stderr noise, return clean stdout
1414
drush_ev() {
15-
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tr -d '[:space:]'
15+
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tail -1 | tr -d '[:space:]'
1616
}
1717

1818
step "CUJ 6: Configure Solr Server ($MODULE)"

.github/scripts/solr9-cuj7-create-index.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,21 @@ MODULE="${MODULE:?MODULE env var must be set}"
1111
step() { echo ""; echo ">>>>>>>>>> $1 <<<<<<<<<<"; echo ""; }
1212

1313
drush_ev() {
14-
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tr -d '[:space:]'
14+
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tail -1 | tr -d '[:space:]'
1515
}
1616

1717
step "CUJ 7: Create and Configure Search Index ($MODULE)"
1818

1919
if [ "$MODULE" = "apachesolr" ]; then
2020

21-
step "Step 1: Mark all content for reindexing"
21+
step "Step 1: Configure indexing and mark content"
22+
# apachesolr needs entity types and bundles configured before indexing
23+
drush_ev "
24+
\$env_id = apachesolr_default_environment();
25+
module_load_include('inc', 'apachesolr', 'apachesolr.index');
26+
apachesolr_index_set_bundles(\$env_id, 'node', array('article', 'page'));
27+
"
28+
echo "Configured article and page bundles for indexing."
2229
terminus drush "$SITE_ENV" -- solr-mark-all
2330

2431
step "Step 2: Index content"

.github/scripts/solr9-cuj8-validate-search.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MODULE="${MODULE:?MODULE env var must be set}"
1111
step() { echo ""; echo ">>>>>>>>>> $1 <<<<<<<<<<"; echo ""; }
1212

1313
drush_ev() {
14-
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tr -d '[:space:]'
14+
terminus drush "$SITE_ENV" -- ev "$@" 2>/dev/null | tail -1 | tr -d '[:space:]'
1515
}
1616

1717
step "CUJ 8: Validate Search Results ($MODULE)"

0 commit comments

Comments
 (0)