Skip to content

Commit acd10af

Browse files
committed
semantic branch naming
1 parent 7886e64 commit acd10af

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

.github/workflows/checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Checks
33
on:
44
push:
55
branches:
6-
- master
6+
- '*.x'
77
pull_request:
88

99
jobs:
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Composer normalize
1919
uses: docker://ergebnis/composer-normalize-action
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2828

2929
- name: Roave BC Check
3030
uses: docker://nyholm/roave-bc-check-ga

.github/workflows/static.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Static analysis
33
on:
44
push:
55
branches:
6-
- master
6+
- '*.x'
77
pull_request:
88

99
jobs:
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Install legacy zend diactoros as we reference that as well
1919
run: composer require "zendframework/zend-diactoros:2.2.1" --no-interaction --no-update
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v3
3535

3636
- name: PHP-CS-Fixer
3737
uses: docker://oskarstark/php-cs-fixer-ga:2.19.0

.github/workflows/ci.yml renamed to .github/workflows/tests.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
name: CI
1+
name: tests
22

33
on:
44
push:
5+
branches:
6+
- '*.x'
57
pull_request:
68

79
jobs:
@@ -14,7 +16,7 @@ jobs:
1416

1517
steps:
1618
- name: Checkout code
17-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
1820

1921
- name: Setup PHP
2022
uses: shivammathur/setup-php@v2
@@ -44,7 +46,7 @@ jobs:
4446

4547
steps:
4648
- name: Checkout code
47-
uses: actions/checkout@v2
49+
uses: actions/checkout@v3
4850

4951
- name: Setup PHP
5052
uses: shivammathur/setup-php@v2
@@ -67,7 +69,7 @@ jobs:
6769

6870
steps:
6971
- name: Checkout code
70-
uses: actions/checkout@v2
72+
uses: actions/checkout@v3
7173

7274
- name: Setup PHP
7375
uses: shivammathur/setup-php@v2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Latest Version](https://img.shields.io/github/release/php-http/message.svg?style=flat-square)](https://github.com/php-http/message/releases)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
5-
[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/php-http/message/CI?style=flat-square)](https://github.com/php-http/message/actions?query=workflow%3ACI+branch%3Amaster)
5+
[![tests](https://github.com/php-http/message/actions/workflows/ci.yml/badge.svg)](https://github.com/php-http/message/actions/workflows/ci.yml)
66
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/message.svg?style=flat-square)](https://packagist.org/packages/php-http/message)
77

88
**HTTP Message related tools.**

composer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@
4343
"ergebnis/composer-normalize": true
4444
}
4545
},
46-
"extra": {
47-
"branch-alias": {
48-
"dev-master": "1.10-dev"
49-
}
50-
},
5146
"autoload": {
5247
"psr-4": {
5348
"Http\\Message\\": "src/"

0 commit comments

Comments
 (0)