Skip to content

Commit

Permalink
CI: keep build without docker, for now (paratestphp#855)
Browse files Browse the repository at this point in the history
  • Loading branch information
Slamdunk committed May 31, 2024
1 parent 51b3b85 commit e7385d4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
tools: composer-normalize, composer-require-checker
- uses: "ramsey/composer-install@v2"

- run: "make vendor"
- run: "composer validate --strict"
- run: "composer-normalize --dry-run"
- run: "composer-require-checker check"
Expand All @@ -51,7 +50,6 @@ jobs:
ini-values: "${{ env.INI_VALUES }}"
- uses: "ramsey/composer-install@v2"

- run: "make vendor"
- name: "Lint XMLs"
uses: ./.github/lint-xml-configuration
with:
Expand Down Expand Up @@ -102,9 +100,6 @@ jobs:
# ini-values: "${{ env.INI_VALUES }}"
# - uses: "ramsey/composer-install@v2"
#
# - run: "make test"
# timeout-minutes: 3
#
# - name: "Gather base branch for diff"
# if: ${{ github.event_name == 'pull_request' }}
# run: git fetch origin --no-tags --prune --depth=1 ${{ github.base_ref }} ${{ github.event.pull_request.base.sha }}
Expand Down Expand Up @@ -141,7 +136,6 @@ jobs:
tools: cs2pr
- uses: "ramsey/composer-install@v2"

- run: "make vendor"
- run: "vendor/bin/phpcs -q --report=checkstyle | cs2pr"

static-analysis:
Expand All @@ -161,4 +155,4 @@ jobs:
ini-values: "${{ env.INI_VALUES }}"
- uses: "ramsey/composer-install@v2"

- run: "make static-analysis PHPSTAN_ARGS='--ansi --no-progress'"
- run: "vendor/bin/phpstan --memory-limit=512M --ansi --no-progress"
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/.idea
/.build-cache
/coverage
/test/fixtures/wrapper_batchsize_suite/tmp
/vendor
.env
.phpunit.cache
.phpunit.result.cache
.php_cs.cache
composer.lock
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ vendor: .env docker-compose.yml Dockerfile composer.json
$(DOCKER_PHP_EXEC) composer update
$(DOCKER_PHP_EXEC) composer bump
touch vendor
mkdir .build-cache

.PHONY: csfix
csfix: vendor
$(DOCKER_PHP_EXEC) vendor/bin/phpcbf || true
$(DOCKER_PHP_EXEC) vendor/bin/phpcs --cache
$(DOCKER_PHP_EXEC) vendor/bin/phpcs --cache=.build-cache/phpcs

.PHONY: static-analysis
static-analysis: vendor
Expand Down
1 change: 1 addition & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ includes:
parameters:
level: max
tipsOfTheDay: false
tmpDir: .build-cache/phpstan
paths:
- src/
- test/
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
failOnEmptyTestSuite="true"
beStrictAboutChangesToGlobalState="true"
beStrictAboutOutputDuringTests="true"
cacheDirectory=".phpunit.cache">
cacheDirectory=".build-cache/.phpunit">
<source>
<include>
<directory>src</directory>
Expand Down

0 comments on commit e7385d4

Please sign in to comment.