Skip to content

Commit

Permalink
Fix GitHub Actions workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
allejo committed Jun 1, 2023
1 parent 033defc commit e5a542e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 22 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up PHP ${{ matrix.php-versions }}
uses: shivammathur/setup-php@v2
Expand All @@ -45,10 +45,10 @@ jobs:

- name: Get Composer Cache Directory
id: composer-cache
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
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -58,11 +58,13 @@ jobs:
run: |
# Don't use our lock file for unit tests
rm composer.lock
# We do not use it in unit tests
# Remove PHP 8.1 requirement
sed -i '/"php": ">=8\.1",/d' composer.json
# Remove dependencies we don't need for unit tests that break platform requirements
composer remove --dev \
friendsofphp/php-cs-fixer \
kubawerlos/php-cs-fixer-custom-fixers
bamarni/composer-bin-plugin
composer install
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up PHP 8.0
- name: Set up PHP 8.2
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.2'
extensions: mbstring

- name: Get Composer Cache Directory
id: composer-cache
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
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -43,20 +43,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up PHP 8.0
- name: Set up PHP 8.2
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.2'
extensions: mbstring

- name: Get Composer Cache Directory
id: composer-cache
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
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"php": ">=8.1",
"ext-json": "*",
"bamarni/composer-bin-plugin": "^1.8",
"doctrine/instantiator": "^1.4",
"doctrine/instantiator": "^1.0||^1.1||^1.4",
"erusev/parsedown": "^1.7",
"nikic/php-parser": "^4.13",
"phpdocumentor/reflection-docblock": "^5.2",
"phpunit/phpunit": "^9.5"
"nikic/php-parser": "^3.1||^4.13",
"phpdocumentor/reflection-docblock": "^3.0||^4.3||^5.2",
"phpunit/phpunit": "^4.8||^6.5||^9.5"
},
"autoload": {
"files": ["bottomline.php"],
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e5a542e

Please sign in to comment.