Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix CI #2162

Merged
merged 5 commits into from
Dec 31, 2023
Merged

fix CI #2162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ecdb54
fix CI
smoench Dec 5, 2023
0759a96
Merge branch 'master' into fix-ci
GuilhemN Dec 31, 2023
318b903
typo
GuilhemN Dec 31, 2023
88dd853
test
GuilhemN Dec 31, 2023
c363d76
revert
GuilhemN Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ env:
jobs:
phpunit:
name: "PHPUnit"
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-22.04"

strategy:
fail-fast: false
matrix:
include:
- php-version: 7.2
Expand All @@ -32,28 +33,28 @@ jobs:
symfony-require: "5.4.*"
- php-version: 8.1
symfony-require: "5.4.*"
- php-version: 8.1
symfony-require: "6.3.*"
- php-version: 8.2
symfony-require: "6.4.*"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Php 8.1 is still supported by this version, we could also add a test for this


steps:
- name: "Checkout"
uses: "actions/checkout@v2"
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: "Install PHP without coverage"
uses: "shivammathur/setup-php@v2"
uses: shivammathur/setup-php@v2
with:
php-version: "${{ matrix.php-version }}"
tools: composer
tools: composer, flex
coverage: pcov

- name: Get composer cache directory
- name: "Get composer cache directory"
id: composercache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache dependencies
uses: actions/cache@v2
- name: "Cache dependencies"
uses: actions/cache@v3
with:
path: ${{ steps.composercache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -62,10 +63,7 @@ jobs:
- name: "Install dependencies with composer"
env:
SYMFONY_REQUIRE: "${{ matrix.symfony-require }}"
run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-progress --no-scripts --no-plugins symfony/flex
composer update --no-interaction --no-progress ${{ matrix.composer-flags }}
run: composer update --no-interaction --no-progress ${{ matrix.composer-flags }}

- name: PHPUnit Tests
run: vendor/bin/simple-phpunit --configuration phpunit.xml.dist --coverage-text
- name: "PHPUnit Tests"
run: vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-text
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ jobs:

steps:
- name: "Checkout"
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: "Create cache dir"
run: mkdir .cache

- name: "Extract base branch name"
run: echo "##[set-output name=branch;]$(echo ${GITHUB_BASE_REF:=${GITHUB_REF##*/}})"
run: echo "branch=$(echo ${GITHUB_BASE_REF:=${GITHUB_REF##*/}})" >> $GITHUB_OUTPUT
id: extract_base_branch

- name: "Cache DOCtor-RST"
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: .cache
key: ${{ runner.os }}-doctor-rst-${{ steps.extract_base_branch.outputs.branch }}
Expand Down
11 changes: 5 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"symfony/browser-kit": "^5.4|^6.0",
"symfony/cache": "^5.4|^6.0",
"symfony/form": "^5.4|^6.0",
"symfony/phpunit-bridge": "^6.3.2",
"symfony/phpunit-bridge": "^6.4",
"symfony/property-access": "^5.4|^6.0",
"symfony/serializer": "^5.4|^6.0",
"symfony/stopwatch": "^5.4|^6.0",
Expand All @@ -53,9 +53,11 @@

"friendsofsymfony/rest-bundle": "^2.8|^3.0",
"willdurand/hateoas-bundle": "^1.0|^2.0",
"jms/serializer-bundle": "^2.3|^3.0|^4.0|^5.0@beta",
"jms/serializer-bundle": "^2.3|^3.0|^4.0|^5.0",
"jms/serializer": "^1.14|^3.0",
"composer/package-versions-deprecated": "1.11.99.1"
"composer/package-versions-deprecated": "1.11.99.1",

"phpunit/phpunit": "^8.5|^9.6"
},
"suggest": {
"api-platform/core": "For using an API oriented framework.",
Expand All @@ -70,9 +72,6 @@
"symfony/validator": "For describing the validation constraints in your models.",
"willdurand/hateoas-bundle": "For extracting HATEOAS metadata."
},
"conflict": {
"symfony/framework-bundle": "4.2.7"
},
"autoload": {
"psr-4": {
"Nelmio\\ApiDocBundle\\": ""
Expand Down
Loading