Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI-1035: Put build files in var dir #1616

Merged
merged 2 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

drupal
.idea
build
*.bak
.DS_STORE

Expand Down
3 changes: 1 addition & 2 deletions .phplint.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
path: ./
jobs: 10
cache: build/phplint.cache
cache: var/phplint.cache
extensions:
- php
exclude:
- build
- var
- vendor
warning: false
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions box.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<arg name="extensions" value="php,inc,test,css,txt,md,yml"/>

<arg name="colors"/>
<arg name="cache" value="build/.phpcs-cache"/>
<arg name="cache" value="var/.phpcs-cache"/>
<arg name="parallel" value="10"/>

<file>src</file>
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
cacheResultFile="build/.phpunit.result.cache"
cacheResultFile="var/.phpunit.result.cache"
failOnWarning="true"
failOnRisky="true"
convertErrorsToExceptions="true"
Expand Down
File renamed without changes.