From 54fcb952f4bf306cad7f46c1f8512e0da8b8df86 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 14 Apr 2023 16:31:04 +0200 Subject: [PATCH 1/3] semantic branch naming --- .github/workflows/checks.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/static.yml | 2 +- composer.json | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 85418d3..9609a4f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -3,7 +3,7 @@ name: Checks on: push: branches: - - master + - '*.x' pull_request: jobs: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b480393..dbb60c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ name: CI on: push: branches: - - master + - '*.x' pull_request: jobs: diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index a8dcf9a..9c91580 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -3,7 +3,7 @@ name: Static analysis on: push: branches: - - master + - '*.x' pull_request: jobs: diff --git a/composer.json b/composer.json index 268b27e..142e704 100644 --- a/composer.json +++ b/composer.json @@ -28,11 +28,6 @@ "friends-of-phpspec/phpspec-code-coverage": "^4.1", "phpspec/phpspec": "^5.1 || ^6.0" }, - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "psr-4": { "Http\\Client\\": "src/" From 64d18287787d378be296c5d433377d391b6bc0a5 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 14 Apr 2023 16:33:44 +0200 Subject: [PATCH 2/3] cleanup ci actions configuration --- .github/workflows/checks.yml | 19 ------------------- .github/workflows/ci.yml | 15 ++++----------- .github/workflows/static.yml | 4 ++-- composer.json | 4 ++-- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 .github/workflows/checks.yml diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml deleted file mode 100644 index 9609a4f..0000000 --- a/.github/workflows/checks.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Checks - -on: - push: - branches: - - '*.x' - pull_request: - -jobs: - roave-bc-check: - name: Roave BC Check - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Roave BC Check - uses: "docker://nyholm/roave-bc-check-ga" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbb60c4..af18c95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -25,15 +25,8 @@ jobs: tools: composer:v2 coverage: none - - name: Install PHP 7 dependencies + - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress - if: "startsWith(matrix.php, '7.')" - - - name: Install PHP 8 dependencies - run: | - composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update - composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php - if: "startsWith(matrix.php, '8.')" - name: Execute tests run: composer test @@ -47,7 +40,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -70,7 +63,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 9c91580..98c17c1 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: PHPStan uses: docker://oskarstark/phpstan-ga @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: PHP-CS-Fixer uses: docker://oskarstark/php-cs-fixer-ga diff --git a/composer.json b/composer.json index 142e704..c169089 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,8 @@ "psr/http-message": "^1.0" }, "require-dev": { - "friends-of-phpspec/phpspec-code-coverage": "^4.1", - "phpspec/phpspec": "^5.1 || ^6.0" + "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0", + "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0" }, "autoload": { "psr-4": { From a44b89d7fcc90f75306eb03badb9ab0713b7fe64 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Fri, 14 Apr 2023 16:34:21 +0200 Subject: [PATCH 3/3] php 8.1 and 8.2 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af18c95..ad3f5c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.2', '7.3', '7.4', '8.0'] + php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout code @@ -36,7 +36,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.4', '8.0'] + php: ['7.1', '7.4', '8.0', '8.1', '8.2'] steps: - name: Checkout code