Include binaries during ddev start #172

.github/workflows/TestEnv.yml

@@ -30,6 +30,7 @@ jobs:
 
       - name: Setup Project
         run: |
+          set -x
           ddev config --auto
           ddev start
           ddev composer config extra.drupal-scaffold.gitignore true
@@ -39,7 +40,10 @@ jobs:
           ddev composer config --no-plugins allow-plugins.lullabot/drainpipe true
           ddev composer config repositories.drainpipe --json "{\"type\": \"path\", \"url\": \"drainpipe\", \"options\": {\"symlink\": false}}"
           ddev composer config minimum-stability dev
-          cat composer.json | jq --indent 4 '."autoload-dev" = {"files": ["vendor/lullabot/drainpipe/scaffold/env/dotenv.php"]}' | tee composer.json > /dev/null
+          # cat + tee still has a race condition causing random failures.
+          # https://stackoverflow.com/a/68676400
+          cat composer.json | jq --indent 4 '."autoload-dev" = {"files": ["vendor/lullabot/drainpipe/scaffold/env/dotenv.php"]}' | tee composer.new.json
+          mv composer.new.json composer.json
           ddev composer update --lock
           ddev composer validate
           ddev composer require lullabot/drainpipe --with-all-dependencies

.github/workflows/test-production-build.yml

@@ -39,7 +39,7 @@ jobs:
           cd ../
           composer create-project drupal/recommended-project drupal --ignore-platform-req=ext-gd
           cd drupal
-          cp ${GITHUB_WORKSPACE}/tests/fixtures.drainpipe-test-build/Taskfile.yml .
+          cp ${GITHUB_WORKSPACE}/tests/fixtures/drainpipe-test-production-build/Taskfile.yml .
           composer config extra.drupal-scaffold.gitignore true
           composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe"]'
           composer config --no-plugins allow-plugins.composer/installers true
@@ -49,7 +49,44 @@ jobs:
           composer config minimum-stability dev
           composer require "lullabot/drainpipe @dev" --with-all-dependencies
 
-      - name: Run static tests
+      - name: Run production build
         run: |
           cd ../drupal
           ./vendor/bin/task build
+
+  Test-Production-Build-DDEV-Global-Binary:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: drainpipe
+
+      - uses: ./drainpipe/scaffold/github/actions/common/set-env
+
+      - name: Install DDEV
+        uses: ./drainpipe/scaffold/github/actions/common/ddev
+        with:
+          git-name: Drainpipe Bot
+          git-email: no-reply@example.com
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+
+      - name: Setup Project
+        run: |
+          cp drainpipe/tests/fixtures/drainpipe-test-production-build/composer-ddev-global-binary.json composer.json
+          cp drainpipe/tests/fixtures/drainpipe-test-production-build/Taskfile.yml .
+          ddev config --project-type=drupal9
+          ddev start
+          ddev composer install
+          # ddev won't create settings.ddev.php until settings.php exists.
+          ddev config --project-type=drupal9
+          ddev restart
+
+      - name: Install Drupal
+        run: |
+          ddev drush site:install minimal -y
+          echo "\$settings['config_sync_directory'] = '../config';" >> web/sites/default/settings.php
+          ddev drush config:export -y
+
+      - name: Run production build
+        run: ddev task build

README.md

@@ -56,6 +56,17 @@ for a Drupal site, including:
 ```sh
 composer config extra.drupal-scaffold.gitignore true
 composer config --json extra.drupal-scaffold.allowed-packages "[\"lullabot/drainpipe\", \"lullabot/drainpipe-dev\"]"
+composer config --json extra.drainpipe.global-binaries.task "true"
+composer config --json extra.drainpipe.global-binaries.local-php-security-checker "true"
+```
+
+If using DDEV (highly recommended!), additionally set `task` to be a global binary:
+```sh
+ddev composer config extra.drainpipe.global-binaries.task true
+```
+
+Finally, require `drainpipe` and `drainpipe-dev`
+```sh
 composer require lullabot/drainpipe
 composer require lullabot/drainpipe-dev --dev
 ```
@@ -72,7 +83,7 @@ Task is just a single binary and has no other dependencies. It's also
 cross-platform with everything running through the same [shell interpreter](https://github.com/mvdan/sh).
 
 You can see what tasks are available after installation by running
-`./vendor/bin/task --list` or `ddev task --list` if you're running DDEV. To get
+`task --list` or `ddev task --list` if you're running DDEV. To get
 more information on a specific task e.g. what parameters it takes, you can run
 `task [task name] --summary`.
 

scaffold/ddev/task-command.sh

@@ -4,4 +4,4 @@
 ## Usage: task
 ## Example: "ddev task build"
 
-./vendor/bin/task "$@"
+task "$@"

scaffold/ddev/web-build/Dockerfile.drainpipe

@@ -0,0 +1,8 @@
+COPY install-task.sh /usr/local/bin
+RUN chmod +x /usr/local/bin/install-task.sh
+# Also update .github/workflows/ValidateTaskfile.yml if changing version.
+RUN install-task.sh -b /usr/local/bin -d v3.28.0
+
+COPY install-local-php-security-checker.sh /usr/local/bin
+RUN chmod +x /usr/local/bin/install-local-php-security-checker.sh
+RUN install-local-php-security-checker.sh -b /usr/local/bin -d v2.0.6