diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5278631ea..d9c7ce494 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,12 +110,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: acli.phar - path: build/acli.phar + path: var/acli.phar - name: Release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: - files: build/acli.phar + files: var/acli.phar # Require all checks to pass without having to enumerate them in the branch protection UI. # @see https://github.community/t/is-it-possible-to-require-all-github-actions-tasks-to-pass-without-enumerating-them/117957 check: diff --git a/.gitignore b/.gitignore index 257a1a560..ebe6ebd24 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ drupal .idea -build *.bak .DS_STORE diff --git a/.phplint.yml b/.phplint.yml index cfb9f76a5..4689aa7ec 100644 --- a/.phplint.yml +++ b/.phplint.yml @@ -1,10 +1,9 @@ path: ./ jobs: 10 -cache: build/phplint.cache +cache: var/phplint.cache extensions: - php exclude: - - build - var - vendor warning: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3da22d2b7..507423da9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ Any changes to the `acli update` command should be manually tested using the fol 1. Replace `@package_version@` on this line with `1.0.0` or any older version string: https://github.com/acquia/cli/blob/v1.0.0/bin/acli#L84 1. Build acli.phar as described above. -1. Now test: `./build/acli.phar self:update` +1. Now test: `./var/acli.phar self:update` ### Writing tests diff --git a/box.json b/box.json index 8071ef83b..c16212725 100644 --- a/box.json +++ b/box.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/box-project/box/4.3.7/res/schema.json", "directories": [ "config", - "var" + "var/cache" ], "files": [ ".env" @@ -11,7 +11,7 @@ "KevinGH\\Box\\Compactor\\Php", "KevinGH\\Box\\Compactor\\Json" ], - "output": "build/acli.phar", + "output": "var/acli.phar", "exclude-composer-files": false, "force-autodiscovery": true } diff --git a/build/.gitkeep b/build/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/composer.json b/composer.json index 989de611f..cf89fbe0a 100644 --- a/composer.json +++ b/composer.json @@ -137,10 +137,10 @@ "rm -rf gardener" ], "box-install": [ - "curl -f -L https://github.com/box-project/box/releases/download/4.4.0/box.phar -o build/box.phar" + "curl -f -L https://github.com/box-project/box/releases/download/4.4.0/box.phar -o var/box.phar" ], "box-compile": [ - "php build/box.phar compile" + "php var/box.phar compile" ], "infection": [ "php -d pcov.enabled=1 vendor/bin/infection --threads=8" @@ -153,7 +153,7 @@ ], "unit-serial": "phpunit tests/phpunit -vvv --group serial", "unit-parallel": "paratest --exclude-group serial", - "coverage": "php -d pcov.enabled=1 vendor/bin/phpunit tests/phpunit --coverage-clover build/logs/clover.xml", + "coverage": "php -d pcov.enabled=1 vendor/bin/phpunit tests/phpunit --coverage-clover var/logs/clover.xml", "lint": "phplint", "test": [ "@lint", diff --git a/phpcs.xml.dist b/phpcs.xml.dist index bc110a0fe..7c6890083 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -11,7 +11,7 @@ - + src diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 126b0f74d..9428e59f4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,7 +3,7 @@