Skip to content

Commit

Permalink
Merge pull request #936 from cakephp/merge-2x
Browse files Browse the repository at this point in the history
merge 2.x => 3.x
  • Loading branch information
LordSimal committed Sep 5, 2023
2 parents 5ff5111 + 83a3200 commit ecda9bb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
pull_request:
branches:
- '*'
workflow_dispatch:

permissions:
contents: read
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy_docs_2x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ on:
push:
branches:
- 2.x
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Cloning repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down

0 comments on commit ecda9bb

Please sign in to comment.