From 255d974f5ac1ae245742bd8ec219dc3741de3e09 Mon Sep 17 00:00:00 2001 From: Fordnox Date: Sun, 1 Nov 2020 16:39:19 +0200 Subject: [PATCH] Revert composer move --- .github/workflows/php.yml | 5 ++++- Makefile | 2 +- composer.json => src/composer.json | 6 +++--- composer.lock => src/composer.lock | 0 4 files changed, 8 insertions(+), 5 deletions(-) rename composer.json => src/composer.json (91%) rename composer.lock => src/composer.lock (100%) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 1c0f4a813..9c14b2c3a 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -16,6 +16,7 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate + working-directory: ./src - name: Cache Composer packages id: composer-cache @@ -28,10 +29,12 @@ jobs: - name: Install dependencies if: steps.composer-cache.outputs.cache-hit != 'true' run: composer install --prefer-dist --no-progress --no-suggest + working-directory: ./src # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit" # Docs: https://getcomposer.org/doc/articles/scripts.md - name: Run test suite for composer updates. - run: composer install --prefer-dist --no-progress --no-suggest + run: composer install --prefer-dist --no-progress --no-suggest + working-directory: ./src - name: Configure environment for Tests run: | cp ./src/bb-config-sample.php ./src/bb-config.php diff --git a/Makefile b/Makefile index 9f7144865..17b394f17 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ exec-db: ## Enter DB container shell $(DOCKER_DB_CONTAINER_EXEC) bash install: start ## Install app after start - $(DOCKER_PHP_CONTAINER_EXEC) composer install + $(DOCKER_PHP_CONTAINER_EXEC) composer install --working-dir=src ifeq (,$(wildcard ./src/bb-config.php)) cp ./src/bb-config-sample.php ./src/bb-config.php $(DOCKER_PHP_CONTAINER_EXEC) $(DOCKER_PHP_EXECUTABLE_CMD) ./bin/prepare.php diff --git a/composer.json b/src/composer.json similarity index 91% rename from composer.json rename to src/composer.json index 271cca18b..3772d6ed9 100644 --- a/composer.json +++ b/src/composer.json @@ -37,11 +37,11 @@ "ext-gettext": "*" }, "config": { - "vendor-dir": "src/bb-vendor" + "vendor-dir": "bb-vendor" }, "autoload": { - "psr-0": {"": "src/bb-library"}, - "psr-4": {"Box\\Mod\\": "src/bb-modules"} + "psr-0": {"": "bb-library"}, + "psr-4": {"Box\\Mod\\": "bb-modules"} }, "require-dev": { diff --git a/composer.lock b/src/composer.lock similarity index 100% rename from composer.lock rename to src/composer.lock