Skip to content

Commit

Permalink
Update Satis to work with PHP 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wpscholar committed Nov 6, 2023
1 parent 8e29a36 commit 61d0dc1
Show file tree
Hide file tree
Showing 6 changed files with 1,442 additions and 461 deletions.
50 changes: 50 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
version: 2
updates:

# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "develop"
allow:
- dependency-type: direct
schedule:
interval: "daily"
commit-message:
prefix: "GitHub Actions"
include: "scope"
labels:
- "dependencies"

# Maintain dependencies for npm
- package-ecosystem: "npm"
directory: "/"
target-branch: "develop"
allow:
- dependency-type: direct
schedule:
interval: "daily"
versioning-strategy: increase
commit-message:
prefix: "NPM"
prefix-development: "NPM Dev"
include: "scope"
labels:
- "dependencies"
- "javascript"

# Maintain dependencies for Composer
- package-ecosystem: "composer"
directory: "/"
target-branch: "develop"
schedule:
interval: "daily"
allow:
- dependency-type: direct
versioning-strategy: increase
commit-message:
prefix: "Composer"
prefix-development: "Composer Dev"
include: "scope"
labels:
- "dependencies"
- "php"
8 changes: 4 additions & 4 deletions .github/workflows/satis-build-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
coverage: none
tools: composer, cs2pr

Expand All @@ -52,7 +52,7 @@ jobs:
run: composer install

- name: Checkout GitHub pages branch
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: gh-pages
path: ./dist
Expand All @@ -75,7 +75,7 @@ jobs:
cd -
- name: Push changes
uses: ad-m/github-push-action@master
uses: ad-m/github-push-action@v0.8.0
with:
branch: gh-pages
directory: ./dist
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/satis-build-on-webhook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.1'
coverage: none
tools: composer, cs2pr

Expand All @@ -54,7 +54,7 @@ jobs:
run: composer install

- name: Checkout GitHub pages branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: gh-pages
path: ./dist
Expand All @@ -77,7 +77,7 @@ jobs:
cd -
- name: Push changes
uses: ad-m/github-push-action@master
uses: ad-m/github-push-action@v0.8.0
with:
branch: gh-pages
directory: ./dist
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/.idea
/.vscode
/dist/
/vendor/
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,22 @@
"authors": [
{
"name": "Micah Wood",
"email": "micah.wood@newfold.com"
"homepage": "https://wpscholar.com"
}
],
"require": {
"composer/satis": "^1.0"
"composer/satis": "dev-main#c2e014530a5b625c759c9e84931ae0b8e8b9f9a2"
},
"require-dev": {
"roave/security-advisories": "dev-latest"
},
"scripts": {
"satis": "vendor/bin/satis",
"build": "@php -dmemory_limit=-1 vendor/bin/satis build ./satis.json ./dist"
},
"config": {
"allow-plugins": {
"composer/satis": true
}
}
}
Loading

0 comments on commit 61d0dc1

Please sign in to comment.