Skip to content

Commit 52ae754

Browse files
committed
fixed CI
1 parent c0499dc commit 52ae754

File tree

2 files changed

+46
-56
lines changed

2 files changed

+46
-56
lines changed

.github/workflows/ci.yaml

Lines changed: 46 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ 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
1113
run: docker compose pull php
12-
# - name: Docker caching
13-
# uses: satackey/action-docker-layer-caching@v0.0.11
14-
# continue-on-error: true
1514
- name: Start PHP container
1615
run: docker compose up --detach --build --no-deps php
1716
- name: Run composer validate
@@ -21,18 +20,17 @@ jobs:
2120
runs-on: ubuntu-latest
2221
steps:
2322
- name: Checkout repository
24-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
24+
- name: Set up Docker Compose
25+
uses: docker/setup-compose-action@v1
2526
- name: Docker pull
2627
run: docker compose pull php
27-
# - name: Docker caching
28-
# uses: satackey/action-docker-layer-caching@v0.0.11
29-
# continue-on-error: true
30-
# - name: Composer caching
31-
# uses: actions/cache@v2
32-
# with:
33-
# path: ./build/.composer
34-
# key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.json') }}
35-
# restore-keys: ${{ runner.os }}-composer-v1-
28+
- name: Composer caching
29+
uses: actions/cache@v4
30+
with:
31+
path: ./build/.composer
32+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
33+
restore-keys: ${{ runner.os }}-composer-v2-
3634
- name: Start PHP container
3735
run: docker compose up --detach --build --no-deps php
3836
- name: Install dependencies
@@ -44,52 +42,46 @@ jobs:
4442
runs-on: ubuntu-latest
4543
steps:
4644
- name: Checkout repository
47-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
46+
- name: Set up Docker Compose
47+
uses: docker/setup-compose-action@v1
4848
- name: Docker pull
4949
run: docker compose pull
50-
# - name: Docker caching
51-
# uses: satackey/action-docker-layer-caching@v0.0.11
52-
# continue-on-error: true
53-
# - name: Composer caching
54-
# uses: actions/cache@v2
55-
# with:
56-
# path: ./build/.composer
57-
# key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.json') }}
58-
# restore-keys: ${{ runner.os }}-composer-v1-
50+
- name: Composer caching
51+
uses: actions/cache@v4
52+
with:
53+
path: ./build/.composer
54+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
55+
restore-keys: ${{ runner.os }}-composer-v2-
5956
- name: Start containers
6057
run: docker compose up --detach --build
6158
- name: Install dependencies
6259
run: docker compose exec -T php composer install --no-scripts --no-interaction --ansi
6360
- name: Run phpunit
6461
run: docker compose exec -T php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
65-
# - name: Upload coverage report to Codecov.io
66-
# uses: codecov/codecov-action@v2
67-
# with:
68-
# files: ./build/.phpunit/clover.xml
69-
# fail_ci_if_error: true
70-
# verbose: true
71-
# - name: Upload coverage report to GitHub.com
72-
# uses: actions/upload-artifact@v2
73-
# with:
74-
# name: Code Coverage Report
75-
# path: build/.phpunit/code-coverage/*
62+
- name: Upload coverage report to Codecov.io
63+
uses: codecov/codecov-action@v5
64+
with:
65+
files: ./build/.phpunit/clover.xml
66+
fail_ci_if_error: true
67+
verbose: true
68+
token: ${{ secrets.CODECOV_TOKEN }}
7669
run-rector:
7770
name: rector
7871
runs-on: ubuntu-latest
7972
steps:
8073
- name: Checkout repository
81-
uses: actions/checkout@v2
74+
uses: actions/checkout@v4
75+
- name: Set up Docker Compose
76+
uses: docker/setup-compose-action@v1
8277
- name: Docker pull
8378
run: docker compose pull php
84-
# - name: Docker caching
85-
# uses: satackey/action-docker-layer-caching@v0.0.11
86-
# continue-on-error: true
87-
# - name: Composer caching
88-
# uses: actions/cache@v2
89-
# with:
90-
# path: ./build/.composer
91-
# key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.json') }}
92-
# restore-keys: ${{ runner.os }}-composer-v1-
79+
- name: Composer caching
80+
uses: actions/cache@v4
81+
with:
82+
path: ./build/.composer
83+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
84+
restore-keys: ${{ runner.os }}-composer-v2-
9385
- name: Start PHP container
9486
run: docker compose up --detach --build --no-deps php
9587
- name: Install dependencies
@@ -101,18 +93,17 @@ jobs:
10193
runs-on: ubuntu-latest
10294
steps:
10395
- name: Checkout repository
104-
uses: actions/checkout@v2
96+
uses: actions/checkout@v4
97+
- name: Set up Docker Compose
98+
uses: docker/setup-compose-action@v1
10599
- name: Docker pull
106100
run: docker compose pull php
107-
# - name: Docker caching
108-
# uses: satackey/action-docker-layer-caching@v0.0.11
109-
# continue-on-error: true
110-
# - name: Composer caching
111-
# uses: actions/cache@v2
112-
# with:
113-
# path: ./build/.composer
114-
# key: ${{ runner.os }}-composer-v1-${{ hashFiles('composer.json') }}
115-
# restore-keys: ${{ runner.os }}-composer-v1-
101+
- name: Composer caching
102+
uses: actions/cache@v4
103+
with:
104+
path: ./build/.composer
105+
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
106+
restore-keys: ${{ runner.os }}-composer-v2-
116107
- name: Start PHP container
117108
run: docker compose up --detach --build --no-deps php
118109
- name: Install dependencies

docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: '3.7'
21
services:
32

43
php:

0 commit comments

Comments
 (0)