Skip to content

Commit

Permalink
Merge branch '5.x' into feature/fire-entryblueprintfound-before-creating
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanmitchell authored Oct 8, 2024
2 parents da65d54 + 3956ab1 commit 0c52563
Show file tree
Hide file tree
Showing 2,197 changed files with 76,891 additions and 22,035 deletions.
11 changes: 1 addition & 10 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body:
label: Environment
description: |
Details about your environment. Versions of Statamic, PHP, Laravel, any addons that are installed, etc.
(Go ahead and just paste the output of the `php please support:details` command.)
(Go ahead and just paste the output of the `php please support:details` command.)
render: yaml # the format of the command is close to yaml and gets highlighted nicely
validations:
required: true
Expand All @@ -40,15 +40,6 @@ body:
- Other (please explain)
validations:
required: true
- type: dropdown
attributes:
label: Antlers Parser
description: If using 3.3+, which Antlers Parser are you using?
options:
- regex (default)
- runtime (new)
validations:
required: false
- type: textarea
attributes:
label: Additional details
Expand Down
15 changes: 15 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
First of all, thank _you_ 🫵 for taking the time to contribute to Statamic, we really appreciate it! 💜

Please take 30 seconds to read the following so we can be as efficient as possible when reviewing and considering merging PRs:

1️⃣ Is this your first PR? If so, please read our [contribution guide](https://statamic.dev/contribution-guide) first.

2️⃣ Please make sure to create a new branch for your PR.

3️⃣ Typically you should target the branch of the most current release, e.g. `5.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.

4️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.

5️⃣ If your PR introduce a new feature, adds to an existing one, or changes current behavior, please **open an issue for it in the [statamic/docs](https://github.com/statamic/docs/issues) repo referencing your PR**. A simple "Goes along with statamic/cms#9000" is enough. Otherwise it's really easy to forget and no will ever become aware of your ✨ sparkling ✨ invention if it's not documented.

6️⃣ Remove this placeholder text and replace it with a description of what this PR is doing.
8 changes: 5 additions & 3 deletions .github/workflows/pint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
token: ${{ secrets.PINT }}

- name: Fix PHP code style issues
uses: aglipanci/laravel-pint-action@1.0.0
uses: aglipanci/laravel-pint-action@v2
with:
pintVersion: 1.16.0

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
5 changes: 3 additions & 2 deletions .github/workflows/pint-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ jobs:

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

- name: Check PHP code style issues
uses: aglipanci/laravel-pint-action@1.0.0
uses: aglipanci/laravel-pint-action@v2
with:
testMode: true
verboseMode: true
pintVersion: 1.16.0
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uneditable:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
script: |
const repo = context.repo.repo;
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Use Node.js 16.13.0
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: 16.13.0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 60
Expand Down
59 changes: 37 additions & 22 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Run Tests

on:
push:
branches:
- master
- '*.x'
pull_request:
schedule:
- cron: '0 0 * * *'
Expand All @@ -13,32 +16,32 @@ jobs:

strategy:
matrix:
php: [8.0, 8.1, 8.2]
laravel: [9.*, 10.*]
php: [8.1, 8.2, 8.3]
laravel: [10.*, 11.*]
stability: [prefer-lowest, prefer-stable]
os: [ubuntu-latest]
include:
- os: windows-latest
php: 8.1
laravel: 9.*
php: 8.3
laravel: 10.*
stability: prefer-stable
- os: windows-latest
php: 8.1
laravel: 10.*
php: 8.3
laravel: 11.*
stability: prefer-stable
exclude:
- php: 8.0
laravel: 10.*
- php: 8.1
laravel: 11.*

name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}

steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v36
uses: tj-actions/changed-files@v44
with:
files: |
config
Expand All @@ -50,18 +53,20 @@ jobs:
tests
composer.json
phpunit.xml.dist
.github/workflows/tests.yml
**.php
- name: Determine whether tests should run
id: should-run-tests
if: steps.changed-files.outputs.any_modified == 'true' || github.event_name == 'schedule'
run: echo "result=true" >> $GITHUB_OUTPUT
run: |
echo "result=true" >> $GITHUB_OUTPUT
echo "result=true" >> $env:GITHUB_OUTPUT
- name: Update apt sources
if: steps.should-run-tests.outputs.result == 'true' && matrix.os == 'ubuntu-latest'
run: |
sudo gem install apt-spy2
sudo apt-spy2 fix --commit --launchpad --country=US
sudo apt-get check || sudo apt --fix-broken install -y
sudo apt-get update
- name: Install French Locale
Expand All @@ -73,11 +78,12 @@ jobs:
if: steps.should-run-tests.outputs.result == 'true'
with:
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
extensions: fileinfo, exif, gd, pdo, sqlite, pdo_sqlite
ini-values: short_open_tag=on
coverage: none

- name: Install dependencies
uses: nick-invision/retry@v2
uses: nick-invision/retry@v3
if: steps.should-run-tests.outputs.result == 'true'
with:
timeout_minutes: 5
Expand All @@ -102,20 +108,28 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v36
uses: tj-actions/changed-files@v44
with:
files: |
**.{js,vue,ts}
**/*.{js,vue,ts}
package.json
.github/workflows/tests.yml
- name: Determine whether tests should run
id: should-run-tests
if: steps.changed-files.outputs.any_modified == 'true' || github.event_name == 'schedule'
run: echo "result=true" >> $GITHUB_OUTPUT
run: |
echo "result=true" >> $GITHUB_OUTPUT
echo "result=true" >> $env:GITHUB_OUTPUT
- name: Use Node.js 16.13.0
uses: actions/setup-node@v4
with:
node-version: 16.13.0

- name: Install required npm version
if: steps.should-run-tests.outputs.result == 'true'
Expand All @@ -135,12 +149,13 @@ jobs:
needs: [php-tests, js-tests]
if: always()
steps:
- uses: technote-space/workflow-conclusion-action@v1
- uses: technote-space/workflow-conclusion-action@v3
- name: Send Slack notification
uses: 8398a7/action-slack@v2
if: env.WORKFLOW_CONCLUSION == 'failure'
uses: 8398a7/action-slack@v3
if: env.WORKFLOW_CONCLUSION == 'failure' && github.event_name == 'schedule'
with:
status: failure
fields: repo,message,commit,author,action,eventName,ref,workflow
author_name: ${{ github.actor }}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
node_modules
.DS_Store
.phpunit.result.cache
.phpunit.cache
.php-cs-fixer.cache
tests/Fakes/Composer/Package/test-package/composer.json
resources/dist
Expand Down
Loading

0 comments on commit 0c52563

Please sign in to comment.