Use drupal/recommended projects instead of drupal-composer for Drupal…

… 8 tests #76
wodby · Nov 2, 2020 · 7e85f4a · 7e85f4a
1 parent 20096f6
commit 7e85f4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/7/tests/8/run.sh b/7/tests/8/run.sh
@@ -23,6 +23,6 @@ if [[ "${IMAGE}" =~ "-dev-macos" ]]; then
     docker-compose exec php sudo init_container
 fi
 
-docker-compose exec --user=0 php apk add --update jq
+docker-compose exec --user=0 php apk add --update jq grep
 docker-compose exec php tests.sh
 docker-compose down
diff --git a/7/tests/8/tests.sh b/7/tests/8/tests.sh
@@ -45,12 +45,16 @@ else
 fi
 
 FILES_ARCHIVE_URL="https://s3.amazonaws.com/wodby-sample-files/drupal-php-import-test/files.tar.gz"
-GIT_URL="https://github.com/drupal-composer/drupal-project.git"
+GIT_URL="https://github.com/drupal/recommended-project"
 
 make git-clone url="${GIT_URL}" -f /usr/local/bin/actions.mk
-make git-checkout target=8.x -f /usr/local/bin/actions.mk
+# Get latest stable drupal 8 tag.
+latest_ver=$(git show-ref --tags | grep -P -o '(?<=refs/tags/)8\.[0-9]+\.[0-9]+$' | sort -rV | head -n1)
+make git-checkout target="${latest_ver}" -f /usr/local/bin/actions.mk
 
 COMPOSER_MEMORY_LIMIT=-1 composer install -n
+## currently doesn't yet support composer 2.0 https://github.com/hechoendrupal/drupal-console-extend-plugin/issues/23
+#composer require --dev drupal/console:@stable
 composer require drupal/redis
 
 cd "${DRUPAL_ROOT}"