Skip to content

Commit 0c62af3

Browse files
committed
Remove master references
1 parent 94f3ddc commit 0c62af3

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,8 @@ updates:
55
schedule:
66
interval: daily
77
open-pull-requests-limit: 10
8+
9+
- package-ecosystem: "github-actions"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"

.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+
- 1.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 tools folder
1414
uses: actions/cache@v1
@@ -44,7 +44,7 @@ jobs:
4444
name: Unit tests
4545
needs: setup
4646
steps:
47-
- uses: actions/checkout@master
47+
- uses: actions/checkout@v2
4848

4949
- name: Setup PHP
5050
uses: shivammathur/setup-php@v2
@@ -94,7 +94,7 @@ jobs:
9494
- setup
9595
- phpunit-with-coverage
9696
steps:
97-
- uses: actions/checkout@master
97+
- uses: actions/checkout@v2
9898

9999
- name: Restore/cache vendor folder
100100
uses: actions/cache@v1
@@ -144,7 +144,7 @@ jobs:
144144
runs-on: ubuntu-latest
145145
needs: [setup, phpunit]
146146
steps:
147-
- uses: actions/checkout@master
147+
- uses: actions/checkout@v2
148148
- name: Restore/cache vendor folder
149149
uses: actions/cache@v1
150150
with:
@@ -154,15 +154,15 @@ jobs:
154154
all-build-${{ hashFiles('**/composer.lock') }}
155155
all-build-
156156
- name: Code style check
157-
uses: phpDocumentor/coding-standard@master
157+
uses: phpDocumentor/coding-standard@latest
158158
with:
159159
args: -s
160160

161161
phpstan:
162162
runs-on: ubuntu-latest
163163
needs: [setup, phpunit]
164164
steps:
165-
- uses: actions/checkout@master
165+
- uses: actions/checkout@v2
166166
- name: Restore/cache vendor folder
167167
uses: actions/cache@v1
168168
with:
@@ -182,7 +182,7 @@ jobs:
182182
runs-on: ubuntu-latest
183183
needs: [setup, phpunit]
184184
steps:
185-
- uses: actions/checkout@master
185+
- uses: actions/checkout@v2
186186

187187
- name: Setup PHP
188188
uses: shivammathur/setup-php@v2
@@ -215,7 +215,7 @@ jobs:
215215
runs-on: ubuntu-latest
216216
needs: [setup, phpunit]
217217
steps:
218-
- uses: actions/checkout@master
218+
- uses: actions/checkout@v2
219219
- name: fetch tags
220220
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
221221
- name: Restore/cache vendor folder
@@ -243,7 +243,7 @@ jobs:
243243
BLACKFIRE_SERVER_TOKEN: "21795bdce7c0b5d24f0ccbb42e2a7518feb5359840752b163652899f927cbf2b"
244244

245245
steps:
246-
- uses: actions/checkout@master
246+
- uses: actions/checkout@v2
247247

248248
- name: Setup PHP
249249
uses: shivammathur/setup-php@v2

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
2-
![](https://github.com/phpdocumentor/typeresolver/workflows/Qa%20workflow/badge.svg?branch=master)
3-
[![Coveralls Coverage](https://img.shields.io/coveralls/github/phpDocumentor/TypeResolver.svg)](https://coveralls.io/github/phpDocumentor/TypeResolver?branch=master)
4-
[![Scrutinizer Code Coverage](https://img.shields.io/scrutinizer/coverage/g/phpDocumentor/TypeResolver.svg)](https://scrutinizer-ci.com/g/phpDocumentor/TypeResolver/?branch=master)
5-
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/phpDocumentor/TypeResolver.svg)](https://scrutinizer-ci.com/g/phpDocumentor/TypeResolver/?branch=master)
2+
![](https://github.com/phpdocumentor/typeresolver/workflows/Qa%20workflow/badge.svg?branch=1.x)
3+
[![Coveralls Coverage](https://img.shields.io/coveralls/github/phpDocumentor/TypeResolver.svg)](https://coveralls.io/github/phpDocumentor/TypeResolver?branch=1.x)
4+
[![Scrutinizer Code Coverage](https://img.shields.io/scrutinizer/coverage/g/phpDocumentor/TypeResolver.svg)](https://scrutinizer-ci.com/g/phpDocumentor/TypeResolver/?branch=1.x)
5+
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/phpDocumentor/TypeResolver.svg)](https://scrutinizer-ci.com/g/phpDocumentor/TypeResolver/?branch=1.x)
66
![Packagist Version](https://img.shields.io/packagist/v/phpdocumentor/type-resolver?label=Packagist%20stable)
77
![Packagist Version](https://img.shields.io/packagist/vpre/phpdocumentor/type-resolver?label=Packagist%20unstable)
88

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"extra": {
3131
"branch-alias": {
32-
"dev-master": "1.x-dev"
32+
"dev-1.x": "1.x-dev"
3333
}
3434
}
3535
}

0 commit comments

Comments
 (0)