Skip to content

Commit 31668c3

Browse files
alanbemalanbem
authored
Merge pull request #18 from alanbem/fix-ci
Fixed CI
2 parents 9fc56d9 + 0405032 commit 31668c3

File tree

4 files changed

+67
-56
lines changed

4 files changed

+67
-56
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 52 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,61 +6,66 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout repository
9-
uses: actions/checkout@v2
9+
uses: actions/checkout@v4
10+
- name: Set up Docker Compose
11+
uses: docker/setup-compose-action@v1
1012
- name: Docker pull
11-
run: docker-compose pull php
12-
# - name: Docker build
13-
# run: docker-compose build --force-rm
13+
run: docker compose pull php
14+
- name: Start PHP container
15+
run: docker compose up --detach --build --no-deps php
1416
- name: Run composer validate
15-
run: docker-compose run --rm --no-deps php composer validate --strict --no-interaction --ansi
17+
run: docker compose run --rm --no-deps php composer validate --strict --no-interaction --ansi
1618
run-php-cs-fixer:
1719
name: php-cs-fixer
1820
runs-on: ubuntu-latest
1921
steps:
2022
- name: Checkout repository
21-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
24+
- name: Set up Docker Compose
25+
uses: docker/setup-compose-action@v1
2226
- name: Docker pull
23-
run: docker-compose pull php
24-
# - name: Docker build
25-
# run: docker-compose build --force-rm
27+
run: docker compose pull php
2628
- name: Composer caching
27-
uses: actions/cache@v2
29+
uses: actions/cache@v4
2830
with:
2931
path: ./build/.composer
30-
key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.lock') }}
31-
restore-keys: ${{ runner.os }}-composer-v1-
32+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.lock') }}
33+
restore-keys: ${{ runner.os }}-composer-v2-
3234
- name: Install dependencies
33-
run: docker-compose run --rm --no-deps php composer install --no-scripts --no-interaction --optimize-autoloader --ansi
35+
run: docker compose run --rm --no-deps php composer install --no-scripts --no-interaction --ansi
3436
- name: Run php-cs-fixer
35-
run: docker-compose run --rm --no-deps php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
37+
run: docker compose run --rm --no-deps php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
3638
run-phpunit:
3739
name: phpunit
3840
runs-on: ubuntu-latest
3941
steps:
4042
- name: Checkout repository
41-
uses: actions/checkout@v2
43+
uses: actions/checkout@v4
44+
- name: Set up Docker Compose
45+
uses: docker/setup-compose-action@v1
4246
- name: Docker pull
43-
run: docker-compose pull
44-
# - name: Docker build
45-
# run: docker-compose build --force-rm
47+
run: docker compose pull
4648
- name: Composer caching
47-
uses: actions/cache@v2
49+
uses: actions/cache@v4
4850
with:
4951
path: ./build/.composer
50-
key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.lock') }}
51-
restore-keys: ${{ runner.os }}-composer-v1-
52+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.lock') }}
53+
restore-keys: ${{ runner.os }}-composer-v2-
54+
- name: Start containers
55+
run: docker compose up --detach --build
5256
- name: Install dependencies
53-
run: docker-compose run --rm php composer install --no-scripts --no-interaction --optimize-autoloader --ansi
57+
run: docker compose run --rm --no-deps php composer install --no-scripts --no-interaction --ansi
5458
- name: Run phpunit
55-
run: docker-compose run --rm php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
59+
run: docker compose run --rm --no-deps php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
5660
- name: Upload coverage report to codecov.io
57-
uses: codecov/codecov-action@v2
61+
uses: codecov/codecov-action@v5
5862
with:
5963
files: ./build/.phpunit/clover.xml
6064
fail_ci_if_error: true
6165
verbose: true
66+
token: ${{ secrets.CODECOV_TOKEN }}
6267
- name: Archive code coverage results
63-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v4
6469
with:
6570
name: PHPUnit Code Coverage
6671
path: ./build/.phpunit/code-coverage
@@ -70,38 +75,42 @@ jobs:
7075
runs-on: ubuntu-latest
7176
steps:
7277
- name: Checkout repository
73-
uses: actions/checkout@v2
78+
uses: actions/checkout@v4
79+
- name: Set up Docker Compose
80+
uses: docker/setup-compose-action@v1
7481
- name: Docker pull
75-
run: docker-compose pull php
76-
# - name: Docker build
77-
# run: docker-compose build --force-rm
82+
run: docker compose pull php
7883
- name: Composer caching
79-
uses: actions/cache@v2
84+
uses: actions/cache@v4
8085
with:
8186
path: ./build/.composer
82-
key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.lock') }}
83-
restore-keys: ${{ runner.os }}-composer-v1-
87+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.lock') }}
88+
restore-keys: ${{ runner.os }}-composer-v2-
89+
- name: Start PHP container
90+
run: docker compose up --detach --build --no-deps php
8491
- name: Install dependencies
85-
run: docker-compose run --rm --no-deps php composer install --no-interaction --optimize-autoloader --ansi
92+
run: docker compose run --rm --no-deps php composer install --no-interaction --ansi
8693
- name: Run rector
87-
run: docker-compose run --rm --no-deps php bin/rector --no-progress-bar --dry-run --ansi
94+
run: docker compose run --rm --no-deps php bin/rector --no-progress-bar --dry-run --ansi
8895
run-deptrac:
8996
name: deptrac
9097
runs-on: ubuntu-latest
9198
steps:
9299
- name: Checkout repository
93-
uses: actions/checkout@v2
100+
uses: actions/checkout@v4
101+
- name: Set up Docker Compose
102+
uses: docker/setup-compose-action@v1
94103
- name: Docker pull
95-
run: docker-compose pull php
96-
# - name: Docker build
97-
# run: docker-compose build --force-rm
104+
run: docker compose pull php
98105
- name: Composer caching
99-
uses: actions/cache@v2
106+
uses: actions/cache@v4
100107
with:
101108
path: ./build/.composer
102-
key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.lock') }}
103-
restore-keys: ${{ runner.os }}-composer-v1-
109+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.lock') }}
110+
restore-keys: ${{ runner.os }}-composer-v2-
111+
- name: Start PHP container
112+
run: docker compose up --detach --build --no-deps php
104113
- name: Install dependencies
105-
run: docker-compose run --rm --no-deps php composer install --no-scripts --no-interaction --optimize-autoloader --ansi
114+
run: docker compose run --rm --no-deps php composer install --no-scripts --no-interaction --ansi
106115
- name: Run deptrac
107-
run: docker-compose run --rm --no-deps php bin/deptrac --no-progress --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi
116+
run: docker compose run --rm --no-deps php bin/deptrac --no-progress --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@
3131
###> qossmic/deptrac-shim ###
3232
/.deptrac.cache
3333
###< qossmic/deptrac-shim ###
34+
35+
# OSX files
36+
.DS_Store

‎docker-compose.yaml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
version: '2.4'
21
services:
32

4-
data:
5-
image: busybox:latest
3+
php:
4+
image: streakphp/php80-cli:latest
5+
working_dir: /var/www/project
66
volumes:
77
- .:/var/www/project
88
- ./docker/fpm/etc/php/8.0/cli/php.ini:/etc/php/8.0/cli/php.ini
99
- ./docker/fpm/etc/php/8.0/fpm/pool.d/www.conf:/etc/php/8.0/fpm/pool.d/www.conf
1010
- ./docker/fpm/etc/php/8.0/fpm/pool.d/z-overrides.conf:/etc/php/8.0/fpm/pool.d/z-overrides.conf
11-
12-
php:
13-
image: streakphp/php80-cli:latest
14-
working_dir: /var/www/project
15-
volumes_from:
16-
- data
1711
environment:
1812
COMPOSER_ALLOW_SUPERUSER: 1
1913
COMPOSER_NO_INTERACTION: 1
@@ -28,8 +22,11 @@ services:
2822
fpm:
2923
image: streakphp/php80-fpm:latest
3024
working_dir: /var/www/project
31-
volumes_from:
32-
- data
25+
volumes:
26+
- .:/var/www/project
27+
- ./docker/fpm/etc/php/8.0/cli/php.ini:/etc/php/8.0/cli/php.ini
28+
- ./docker/fpm/etc/php/8.0/fpm/pool.d/www.conf:/etc/php/8.0/fpm/pool.d/www.conf
29+
- ./docker/fpm/etc/php/8.0/fpm/pool.d/z-overrides.conf:/etc/php/8.0/fpm/pool.d/z-overrides.conf
3330
environment:
3431
COMPOSER_ALLOW_SUPERUSER: 1
3532
COMPOSER_NO_INTERACTION: 1

‎docker/supervisord/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM alpine:3
22

3-
RUN apk update && apk add --no-cache python3 py3-pip docker docker-compose
4-
RUN pip3 install --upgrade pip && pip3 install docker-compose supervisor
3+
RUN apk update && \
4+
apk add --no-cache python3 py3-pip docker
5+
RUN pip3 install --upgrade pip --break-system-packages && \
6+
pip3 install supervisor --break-system-packages
57

68
VOLUME /var/run/docker.sock
79
VOLUME /etc/supervisord.conf

0 commit comments

Comments
 (0)