Skip to content

Commit 2e25e76

Browse files
committed
Remove master references
1 parent 985f414 commit 2e25e76

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/push.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
on:
22
push:
33
branches:
4-
- master
4+
- 2.x
55
pull_request:
66
name: Qa workflow
77
jobs:
88
setup:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v2
1212

1313
- name: Restore/cache vendor folder
1414
uses: actions/cache@v1
@@ -46,7 +46,7 @@ jobs:
4646
name: Unit tests
4747
needs: setup
4848
steps:
49-
- uses: actions/checkout@master
49+
- uses: actions/checkout@v2
5050

5151
- name: Setup PHP
5252
uses: shivammathur/setup-php@v2
@@ -96,7 +96,7 @@ jobs:
9696
- setup
9797
- phpunit-with-coverage
9898
steps:
99-
- uses: actions/checkout@master
99+
- uses: actions/checkout@v2
100100

101101
- name: Restore/cache tools folder
102102
uses: actions/cache@v1
@@ -137,7 +137,7 @@ jobs:
137137
runs-on: ubuntu-latest
138138
needs: [setup, phpunit]
139139
steps:
140-
- uses: actions/checkout@master
140+
- uses: actions/checkout@v2
141141
- name: Restore/cache vendor folder
142142
uses: actions/cache@v1
143143
with:
@@ -147,15 +147,15 @@ jobs:
147147
all-build-${{ hashFiles('**/composer.lock') }}
148148
all-build-
149149
- name: Code style check
150-
uses: phpDocumentor/coding-standard@master
150+
uses: phpDocumentor/coding-standard@latest
151151
with:
152152
args: -s
153153

154154
phpstan:
155155
runs-on: ubuntu-latest
156156
needs: [setup, phpunit]
157157
steps:
158-
- uses: actions/checkout@master
158+
- uses: actions/checkout@v2
159159
- name: Restore/cache vendor folder
160160
uses: actions/cache@v1
161161
with:
@@ -165,7 +165,7 @@ jobs:
165165
all-build-${{ hashFiles('**/composer.lock') }}
166166
all-build-
167167
- name: PHPStan
168-
uses: phpDocumentor/phpstan-ga@master
168+
uses: phpDocumentor/phpstan-ga@latest
169169
env:
170170
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171171
with:
@@ -175,7 +175,7 @@ jobs:
175175
runs-on: ubuntu-latest
176176
needs: [setup, phpunit]
177177
steps:
178-
- uses: actions/checkout@master
178+
- uses: actions/checkout@v2
179179

180180
- name: Setup PHP
181181
uses: shivammathur/setup-php@v2
@@ -208,7 +208,7 @@ jobs:
208208
runs-on: ubuntu-latest
209209
needs: [setup, phpunit]
210210
steps:
211-
- uses: actions/checkout@master
211+
- uses: actions/checkout@v2
212212
- name: fetch tags
213213
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
214214
- name: Restore/cache vendor folder

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"extra": {
2424
"branch-alias": {
25-
"dev-master": "2.x-dev"
25+
"dev-2.x": "2.x-dev"
2626
}
2727
}
2828
}

0 commit comments

Comments
 (0)