Merge branch '5.3' into 5

This commit is contained in:
Guy Sartorelli 2024-10-03 10:56:08 +13:00
commit 6bb9e465b6
No known key found for this signature in database
2 changed files with 5 additions and 31 deletions

View File

@ -1,26 +0,0 @@
name: Tag patch release
on:
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch
workflow_dispatch:
inputs:
latest_local_sha:
description: The latest local sha
required: true
type: string
permissions: {}
jobs:
tagpatchrelease:
name: Tag patch release
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Tag release
uses: silverstripe/gha-tag-release@v2
with:
latest_local_sha: ${{ inputs.latest_local_sha }}

View File

@ -4,11 +4,11 @@
"description": "The SilverStripe Framework Installer",
"require": {
"php": "^8.1",
"silverstripe/recipe-plugin": "2.x-dev",
"silverstripe/vendor-plugin": "2.x-dev",
"silverstripe/recipe-cms": "5.x-dev",
"silverstripe-themes/simple": "3.x-dev",
"silverstripe/login-forms": "5.x-dev"
"silverstripe/recipe-plugin": "2.0.x-dev",
"silverstripe/vendor-plugin": "2.0.x-dev",
"silverstripe/recipe-cms": "5.3.x-dev",
"silverstripe-themes/simple": "3.3.x-dev",
"silverstripe/login-forms": "5.3.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.6"