diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f4b5c0..71af9f8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,12 +16,24 @@ jobs: - '8.0' - '8.1' coverage: ['none'] + symfony-versions: + - '4.4.*' + - '5.1.*' + - '5.2.*' + - '5.3.*' include: + - php: '8.0' + symfony-versions: '^6.0' + coverage: 'none' + - php: '8.1' + symfony-versions: '^6.0' + coverage: 'none' - description: 'Log Code Coverage' - php: '8.1' + php: '8.0' coverage: 'xdebug' + symfony-versions: '^5.2' - name: PHP ${{ matrix.php }} ${{ matrix.description }} + name: PHP ${{ matrix.php }} Symfony ${{ matrix.symfony-versions }} ${{ matrix.description }} steps: - name: Checkout uses: actions/checkout@v2 @@ -29,7 +41,7 @@ jobs: - uses: actions/cache@v2 with: path: ~/.composer/cache/files - key: ${{ matrix.php }} + key: ${{ matrix.php }}-${{ matrix.symfony-versions }} - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -48,8 +60,15 @@ jobs: uses: actions/cache@v2.1.2 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - restore-keys: ${{ runner.os }}-${{ matrix.php }}-composer + key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.symfony-versions }}-composer-${{ hashFiles('composer.json') }} + restore-keys: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.symfony-versions }}-composer + + - name: Update Symfony version + if: matrix.symfony-versions != '' + run: | + composer require symfony/yaml:${{ matrix.symfony-versions }} --no-update --no-scripts + composer require symfony/dependency-injection:${{ matrix.symfony-versions }} --no-update --no-scripts + composer require symfony/http-kernel:${{ matrix.symfony-versions }} --no-update --no-scripts - name: Install dependencies run: composer install diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml deleted file mode 100644 index a258b83..0000000 --- a/.github/workflows/create-release.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Create release" -on: - push: - branches: - - main -jobs: - release: - name: Release - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - persist-credentials: false - - name: Setup Node.js - uses: actions/setup-node@v1 - with: - node-version: 12 - - name: Install dependencies - run: npm install && npm install --save-dev semantic-release @semantic-release/changelog @semantic-release/git -D - - name: Release - env: - GH_TOKEN: ${{ secrets.PACKAGIST_PUBLIC_RELEASE_GH }} - GITHUB_TOKEN: ${{ secrets.PACKAGIST_PUBLIC_RELEASE_GH }} - run: npx semantic-release diff --git a/.releaserc b/.releaserc deleted file mode 100644 index 7c42055..0000000 --- a/.releaserc +++ /dev/null @@ -1,41 +0,0 @@ -{ - "branches": [ - "main" - ], - "plugins": [ - "@semantic-release/commit-analyzer", - [ - "@semantic-release/release-notes-generator", - { - "preset": "conventionalcommits", - "parserOpts": { - "noteKeywords": [ - "BREAKING CHANGE", - "BREAKING CHANGES", - "BREAKING" - ] - }, - "writerOpts": { - "commitsSort": [ - "subject", - "scope" - ] - } - } - ], - "@semantic-release/github", - [ - "@semantic-release/changelog", - { - "changelogFile": "CHANGELOG.md", - "changelogTitle": "# Changelog\n\nAll notable changes to this project will be documented in this file. See\n[Conventional Commits](https://conventionalcommits.org) for commit guidelines." - } - ], - [ - "@semantic-release/git", - { - "message": "chore(release): ${nextRelease.version} [skip ci]\n" - } - ] - ] -} diff --git a/README.md b/README.md index 70ed534..8737ef2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Symfony Behat Redis Context | Version | Build Status | Code Coverage | |:---------:|:-------------:|:-----:| -| `master`| [![CI][master Build Status Image]][master Build Status] | [![Coverage Status][master Code Coverage Image]][master Code Coverage] | +| `main`| [![CI][main Build Status Image]][main Build Status] | [![Coverage Status][main Code Coverage Image]][main Code Coverage] | | `develop`| [![CI][develop Build Status Image]][develop Build Status] | [![Coverage Status][develop Code Coverage Image]][develop Code Coverage] | Installation @@ -98,11 +98,11 @@ Go to `behat.yml` ... ``` -[master Build Status]: https://github.com/macpaw/BehatRedisContext/actions?query=workflow%3ACI+branch%3Amaster -[master Build Status Image]: https://github.com/macpaw/BehatRedisContext/workflows/CI/badge.svg?branch=master +[main Build Status]: https://github.com/macpaw/BehatRedisContext/actions?query=workflow%3ACI+branch%3Amain +[main Build Status Image]: https://github.com/macpaw/BehatRedisContext/workflows/CI/badge.svg?branch=main [develop Build Status]: https://github.com/macpaw/BehatRedisContext/actions?query=workflow%3ACI+branch%3Adevelop [develop Build Status Image]: https://github.com/macpaw/BehatRedisContext/workflows/CI/badge.svg?branch=develop -[master Code Coverage]: https://codecov.io/gh/macpaw/BehatRedisContext/branch/master -[master Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/BehatRedisContext/master?logo=codecov +[main Code Coverage]: https://codecov.io/gh/macpaw/BehatRedisContext/branch/main +[main Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/BehatRedisContext/main?logo=codecov [develop Code Coverage]: https://codecov.io/gh/macpaw/BehatRedisContext/branch/develop [develop Code Coverage Image]: https://img.shields.io/codecov/c/github/macpaw/BehatRedisContext/develop?logo=codecov diff --git a/package.json b/package.json index 6a4bea0..b36c73e 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,7 @@ "devDependencies": { "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", - "@semantic-release/changelog": "^5.0.1", - "@semantic-release/git": "^9.0.1", - "husky": "^4.3.0", - "semantic-release": "^17.4.7" + "husky": "^4.3.0" }, "husky": { "hooks": {