Feature/dev 1949

.build-gitignore

@@ -0,0 +1,11 @@
+; Alternative .gitignore file which is used when commit build artifcats.
+.vagrant
+dumps
+npm-debug.log
+node_modules
+bower_components
+web/sites/default/settings.php
+web/sites/default/files
+web/sites/default/private
+web/files
+web/files-private

.defaults.env

@@ -0,0 +1,17 @@
+# Some project-wide default variables.
+# The defaults are loaded via the dotenv loader and not written to the ".env" file. We do not write them to ".env" as
+# the variables may be overriden by the dotenv setup and ".env" variables must be final for docker-compose.
+INSTALL_PROFILE=minimal
+DEFAULT_LANGUAGE=en
+PERSISTENT_FILES_DIR=files
+URL_SCHEME=https
+APP_SECRET={{ secret }}
+APP_SECRET_LONG={{ secret_long }}
+BEHAT_WARMUP_REQUIRED_CONTENT=window.__NUXT__
+
+# Configure URLs via drunomics/multisite-request-matchers, see https://github.com/drunomics/multisite-request-matcher/
+APP_MULTISITE_DOMAIN_PREFIX_SEPARATOR="_"
+APP_SITE_VARIANT_SEPARATOR="--"
+APP_SITE_VARIANTS=""
+APP_DEFAULT_SITE=example
+APP_SITES="example"

.env-defaults

@@ -0,0 +1,7 @@
+# Defaults written to .env during phapp setup - should only contain defaults for docker-compose!
+
+# We cannot use .defaults.env since those variables might have overrides that are applied by the dotenv loader setup,
+# which docker-compose would not pick up. The defaults here should not be overridden in dotenv.
+# Note: This variables are *not* picked up by amazeeio's lagoon hosting, only by docker-compose!
+
+PHAPP_ENV_MYSQL_DEFAULT_PASSWORD={{ secret }}

.github/workflows/test-drupal-setup.yml

@@ -0,0 +1,50 @@
+name: Test drupal setup
+on:
+  repository_dispatch:
+  workflow_dispatch:
+  push:
+    branches:
+     - '6.**'
+  pull_request:
+    types: [opened, reopened]
+jobs:
+  test-drupal-setup:
+    name: Build and install drupal project
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup PHP
+        run: |
+          sudo update-alternatives --set php /usr/bin/php7.4
+      - name: "Determine composer cache directory"
+        id: "determine-composer-cache-directory"
+        run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+      - name: "Cache dependencies installed with composer"
+        uses: actions/cache@v2.1.5
+        with:
+          path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+          key: ${{ runner.os }}-composer-v1-${{ hashFiles('./composer.json') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-v1
+      - name: Install docker-compose.
+        run: |
+          sudo rm /usr/local/bin/docker-compose
+          curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-`uname -s`-`uname -m` > docker-compose
+          chmod +x docker-compose
+          sudo mv docker-compose /usr/local/bin
+      - name: Install composer dependencies.
+        run: |
+          composer config platform-check false
+          composer create-project
+          composer install
+      - name: Setup the environment
+        run: |
+          vendor/bin/phapp setup localdev
+      - name: Setup docker containers
+        run: |
+          export COMPOSE_DEFAULT_USER=$(id -u $USER)
+          docker-compose up -d
+          echo "Waiting for mysql to come up..." && docker-compose exec cli /bin/bash -c "while ! echo exit | nc mariadb 3306; do sleep 1; done" >/dev/null
+          docker-compose exec cli phapp install --no-build
+          curl -v http://example.project.localdev.space | grep "Drupal 9"

.gitignore

@@ -1,21 +1,43 @@
 # Ignore directories generated by Composer
-/drush/contrib/
-/vendor/
+/drush/Commands/contrib
+/vendor
 /web/core/
 /web/modules/contrib/
+/web/modules/drunomics
 /web/themes/contrib/
 /web/profiles/contrib/
 /web/libraries/
 
-# Ignore sensitive information
-/web/sites/*/settings.php
-/web/sites/*/settings.local.php
+# Ignore Drupal per-site environment setup.
+/files
+/web/files
+/web/sites/*/files
+/web/sites/*/files-private
 
-# Ignore Drupal's file directory
-/web/sites/*/files/
+# Ignore local overrides and modules.
+/web/sites/local.*
+/web/modules/local
+/web/themes/local
+/web/profiles/local
 
 # Ignore SimpleTest multi-site environment.
 /web/sites/simpletest
 
-# Ignore files generated by PhpStorm
-/.idea/
+# Ignore files generated by editors and IDEs.
+.idea
+.vscode
+
+# Ignore setup files.
+/docker-compose.overrides.aliases.yml
+/.*.env
+/.env
+/.env.local
+!.defaults.env
+/web/sites/default
+.vagrant
+node_modules
+
+# Ignore .DS_Store files (OSX)
+.DS_Store
+/.editorconfig
+/.gitattributes

.travis.yml

@@ -1,40 +1,57 @@
 language: php
-dist: trusty
-sudo: false
+sudo: required
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
+  - 7.4
+git:
+  depth: false
 
 env:
   global:
-    - SIMPLETEST_DB=sqlite://tmp/site.sqlite
-    - SIMPLETEST_BASE_URL="http://127.0.0.1:8080"
-  matrix:
-    - RELEASE=stable COMPOSER_CHANNEL=stable
-    - RELEASE=dev COMPOSER_CHANNEL=stable
-    - RELEASE=stable COMPOSER_CHANNEL=snapshot
+    - DOCKER_COMPOSE_VERSION=1.22.0
+      COMPOSER_MEMORY_LIMIT=-1
+addons:
+  apt:
+    packages:
+      - docker-ce
 
+# Cache Composer, NPM & Drush directories.
+cache:
+  directories:
+    - $HOME/.cache/composer
+    - $HOME/.npm
+    - $HOME/.drush/cache
+
+# Setup the environment.
 before_install:
-  - echo 'sendmail_path = /bin/true' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - phpenv config-rm xdebug.ini
-  - composer --verbose self-update --$COMPOSER_CHANNEL
-  - composer --version
+  # Be sure no mails are going out by disabling sendmail.
+  - echo sendmail_path=`which true` >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
+  # Upgrade docker compose.
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
 
 install:
-  - composer --verbose install
+  # Update the git branch by composer and create a project.
+  - |
+    source scripts/util/get-branch.sh
+    export GIT_BRANCH=$GIT_BRANCH
+    export GIT_COMMIT=$(git rev-parse HEAD)
+    ./scripts/util/replace-vars.sh < tests/drupal-project/package.envsubst.json > tests/drupal-project/package.json
+    git fetch origin $GIT_BRANCH:$GIT_BRANCH
+    composer create-project drunomics/drupal-project:"dev-$GIT_BRANCH#$GIT_COMMIT" --no-install --repository=tests/drupal-project/package.json project
+    cd project && composer install && cd ../
 
 script:
-  - if [[ $RELEASE = dev ]]; then composer --verbose remove --no-update drupal/console; fi;
-  - if [[ $RELEASE = dev ]]; then composer --verbose require --no-update drupal/core:8.4.x-dev drush/drush:9.0.x-dev; fi;
-  - if [[ $RELEASE = dev ]]; then composer --verbose update; fi;
-  - cd $TRAVIS_BUILD_DIR/web
-  - ./../vendor/bin/drush site-install --verbose --yes --db-url=sqlite://tmp/site.sqlite
-  - ./../vendor/bin/drush runserver $SIMPLETEST_BASE_URL &
-  - until curl -s $SIMPLETEST_BASE_URL; do true; done > /dev/null
-  # Skip core/tests/Drupal/Tests/ComposerIntegrationTest.php because web/ has no composer.json
-  # Ignore PageCache group temporarily, @see https://www.drupal.org/node/2770673
-  - ./../vendor/bin/phpunit -c core --testsuite unit --exclude-group Composer,DependencyInjection,PageCache
-  - ./../vendor/bin/drush
-  - if [[ $RELEASE = stable ]]; then ./../vendor/bin/drupal; fi;
+  - cd project && vendor/bin/phapp setup localdev
+  # Fix permissions in docker container by setting the right user.
+  - export COMPOSE_DEFAULT_USER=$(id -u $USER)
+  - docker-compose up -d
+  - echo "Waiting for mysql to come up..." && docker-compose exec cli /bin/bash -c "while ! echo exit | nc mariadb 3306; do sleep 1; done" >/dev/null
+  - docker-compose exec cli phapp install --no-build
+  - curl -v http://example.project.localdev.space | grep "Drupal 9"
+
+after_success:
+  - echo "SUCCESS!"