Skip to content

Commit

Permalink
Merge pull request #77 from creasico/dependencies-workaround
Browse files Browse the repository at this point in the history
Keep minimum requirement of PHP 8.1 and let dependabot to manage Github Actions version
  • Loading branch information
feryardiant authored Dec 22, 2023
2 parents 91b79fb + e54a8bb commit ba1a05c
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 48 deletions.
10 changes: 8 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
version: 2

updates:
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: monthly
timezone: "Asia/Jakarta"

- package-ecosystem: composer
directory: "/"
schedule:
interval: monthly
timezone: "Asia/Jakarta"
open-pull-requests-limit: 5
versioning-strategy: increase-if-necessary
versioning-strategy: lockfile-only
labels:
- "dependencies"
groups:
Expand All @@ -24,7 +30,7 @@ updates:
interval: monthly
timezone: "Asia/Jakarta"
open-pull-requests-limit: 5
versioning-strategy: increase-if-necessary
versioning-strategy: lockfile-only
labels:
- "dependencies"
groups:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
push:
branches: [main]
# paths: ['.github/**.yml', '**.php', '**.js', '**.ts', '**.vue']
pull_request_target:
pull_request:
branches: [main]
# paths: ['.github/**.yml', '**.php', '**.js', '**.ts', '**.vue']

Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
restore-keys: php-${{ matrix.php }}-composer-

- name: Install dependencies
run: composer install --prefer-dist --no-interaction --no-progress --ansi
run: composer update --prefer-dist --no-interaction --no-progress --ansi

- name: Run unit tests
run: php artisan test --ansi --coverage
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
php-version: 8.1
extensions: curl, intl, libxml, mbstring, pcntl, ssh2, zip
tools: composer:v2
coverage: none
Expand Down Expand Up @@ -62,8 +62,8 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ steps.prepare.outputs.composer-cache }}
key: php-8.2-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: php-8.2-composer-
key: php-8.1-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: php-8.1-composer-

- name: Install dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Desktop.ini
.env.*
.env
.php-version
# composer.lock
.tool-versions
coveralls-upload.json
phpunit.dusk.xml
node_modules
Expand Down
6 changes: 6 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
"spatie/laravel-ignition": "^2.1",
"tightenco/ziggy": "^1.6"
},
"conflict": {
"symfony/css-selector": ">=7.0",
"symfony/event-dispatcher": ">=7.0",
"symfony/options-resolver": ">=7.0",
"symfony/string": ">=7.0"
},
"autoload": {
"psr-4": {
"App\\": "app/",
Expand Down
80 changes: 40 additions & 40 deletions composer.lock

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

0 comments on commit ba1a05c

Please sign in to comment.