Skip to content

Commit

Permalink
Merge branch '73-remove-old-drupal-targets' into 'master'
Browse files Browse the repository at this point in the history
Resolve "Old drupal targets (pre-lando) need to be removed"

Closes #73

See merge request consensus.enterprises/drumkit!41
  • Loading branch information
Seonaid Lee committed Jun 22, 2021
2 parents d99aefc + 1648b97 commit 99ff206
Show file tree
Hide file tree
Showing 20 changed files with 11 additions and 399 deletions.
118 changes: 0 additions & 118 deletions features/drupal.feature

This file was deleted.

2 changes: 0 additions & 2 deletions features/projects/drupal-project.feature
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ Feature: Initialize Drupal projects with Lando.
When I run "make -n init-project-drupal-deps"
Then I should get:
"""
Ensuring PHP dependencies are installed.
Installing Behat.
Ensuring Docker is installed.
in docker group.
Ensuring Lando is installed.
"""
When I run "make -n init-project-drupal"
Expand Down
1 change: 0 additions & 1 deletion features/selfdoc.feature
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Feature: Selfdoc for Drumkit development
"""
ansible
help
drupal
projects
"""
And I run "make help-projects"
Expand Down
6 changes: 0 additions & 6 deletions files/drupal/module/composer.json

This file was deleted.

6 changes: 0 additions & 6 deletions files/drupal/module/example.info.yml

This file was deleted.

6 changes: 0 additions & 6 deletions files/drupal/profile/composer.json

This file was deleted.

6 changes: 0 additions & 6 deletions files/drupal/profile/example.info.yml

This file was deleted.

6 changes: 0 additions & 6 deletions files/drupal/theme/composer.json

This file was deleted.

6 changes: 0 additions & 6 deletions files/drupal/theme/example.info.yml

This file was deleted.

11 changes: 11 additions & 0 deletions mk/tasks/deps.mk
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
local_OS ?= $(shell uname)
ifeq ($(shell whoami),root)
SUDO=
else
SUDO=sudo
endif



deps: apt-update mysql-server

mysql-server: apt-update
ifeq ($(local_OS), Linux)
@echo Installing MySQL server
@echo 'mysql-server mysql-server/root_password password' | $(SUDO) debconf-set-selections
@echo 'mysql-server mysql-server/root_password_again password' | $(SUDO) debconf-set-selections
@$(SUDO) DEBIAN_FRONTEND=noninteractive apt-get -y -qq install mysql-server
endif

apt-update:
ifeq ($(local_OS), Linux)
@echo Updating apt
@$(SUDO) DEBIAN_FRONTEND=noninteractive apt-get update -qq
endif

deps-python: apt-update
ifeq ($(local_OS), Linux)
@echo Ensuring python dependencies are installed.
@$(SUDO) DEBIAN_FRONTEND=noninteractive apt-get install -y -qq python3-minimal python3-pip python3-yaml python3-jinja2
@$(SUDO) update-alternatives --install /usr/bin/python python /usr/bin/python3 1
endif

deps-php: apt-update
ifeq ($(local_OS), Linux)
@echo Ensuring PHP dependencies are installed.
@$(SUDO) DEBIAN_FRONTEND=noninteractive apt-get install -y -qq php-cli php-mbstring php-curl php-xml php-gd unzip tree
endif

# vi:syntax=makefile
33 changes: 0 additions & 33 deletions mk/tasks/drupal.mk

This file was deleted.

10 changes: 0 additions & 10 deletions mk/tasks/drupal/drupal-login.mk

This file was deleted.

11 changes: 0 additions & 11 deletions mk/tasks/drupal/drupal-module.mk

This file was deleted.

33 changes: 0 additions & 33 deletions mk/tasks/drupal/drupal-platform.mk

This file was deleted.

11 changes: 0 additions & 11 deletions mk/tasks/drupal/drupal-profile.mk

This file was deleted.

23 changes: 0 additions & 23 deletions mk/tasks/drupal/drupal-server.mk

This file was deleted.

40 changes: 0 additions & 40 deletions mk/tasks/drupal/drupal-site.mk

This file was deleted.

Loading

0 comments on commit 99ff206

Please sign in to comment.