Skip to content

Commit

Permalink
Merge branch '5.1.x' into good-password
Browse files Browse the repository at this point in the history
# Conflicts:
#	plugins/bc-admin-third/webroot/css/admin/style.css
  • Loading branch information
seto1 committed Jun 28, 2024
2 parents cb20131 + 6355d26 commit e2d0034
Show file tree
Hide file tree
Showing 401 changed files with 11,774 additions and 5,494 deletions.
182 changes: 91 additions & 91 deletions .github/workflows/split_monorepo.yml
Original file line number Diff line number Diff line change
@@ -1,95 +1,95 @@
name: 'Packages Split'

on:
push:
branches:
- master
tags:
- '*'
push:
branches:
- 5.0.x
- 5.1.x
tags:
- '*'
jobs:
packages_split:
runs-on: ubuntu-latest
environment: develop
strategy:
fail-fast: false
matrix:
package:
-
local_path: 'baser-core'
split_repository: 'baser-core'
-
local_path: 'bc-admin-third'
split_repository: 'bc-admin-third'
-
local_path: 'bc-blog'
split_repository: 'bc-blog'
-
local_path: 'BcColumn'
split_repository: 'bc-column'
-
local_path: 'bc-content-link'
split_repository: 'bc-content-link'
-
local_path: 'bc-custom-content'
split_repository: 'bc-custom-content'
-
local_path: 'bc-editor-template'
split_repository: 'bc-editor-template'
-
local_path: 'bc-favorite'
split_repository: 'bc-favorite'
-
local_path: 'bc-front'
split_repository: 'bc-front'
-
local_path: 'bc-installer'
split_repository: 'bc-installer'
-
local_path: 'bc-mail'
split_repository: 'bc-mail'
-
local_path: 'bc-search-index'
split_repository: 'bc-search-index'
-
local_path: 'bc-theme-config'
split_repository: 'bc-theme-config'
-
local_path: 'bc-theme-file'
split_repository: 'bc-theme-file'
-
local_path: 'bc-uploader'
split_repository: 'bc-uploader'
-
local_path: 'bc-widget-area'
split_repository: 'bc-widget-area'
steps:
- uses: actions/checkout@v3
# no tag
-
if: "!startsWith(github.ref, 'refs/tags/')"
name: Monorepo Split of ${{ matrix.package }}
uses: "symplify/[email protected]"
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
package_directory: 'plugins/${{ matrix.package.local_path }}'
repository_organization: 'baserproject'
repository_name: '${{ matrix.package.split_repository }}'
branch: "master"
user_name: "ryuring"
user_email: "[email protected]"
# with tag
-
if: "startsWith(github.ref, 'refs/tags/')"
name: Monorepo Tagged Split of ${{ matrix.package }}
uses: "symplify/[email protected]"
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
tag: ${GITHUB_REF#refs/tags/}
package_directory: 'plugins/${{ matrix.package.local_path }}'
repository_organization: 'baserproject'
repository_name: '${{ matrix.package.split_repository }}'
branch: "master"
user_name: "ryuring"
user_email: "[email protected]"
packages_split:
runs-on: ubuntu-latest
environment: develop
strategy:
fail-fast: false
matrix:
package:
- local_path: 'baser-core'
split_repository: 'baser-core'
- local_path: 'bc-admin-third'
split_repository: 'bc-admin-third'
- local_path: 'bc-blog'
split_repository: 'bc-blog'
- local_path: 'BcColumn'
split_repository: 'bc-column'
- local_path: 'bc-content-link'
split_repository: 'bc-content-link'
- local_path: 'bc-custom-content'
split_repository: 'bc-custom-content'
- local_path: 'bc-editor-template'
split_repository: 'bc-editor-template'
- local_path: 'bc-favorite'
split_repository: 'bc-favorite'
- local_path: 'bc-front'
split_repository: 'bc-front'
- local_path: 'bc-installer'
split_repository: 'bc-installer'
- local_path: 'bc-mail'
split_repository: 'bc-mail'
- local_path: 'bc-search-index'
split_repository: 'bc-search-index'
- local_path: 'bc-theme-config'
split_repository: 'bc-theme-config'
- local_path: 'bc-theme-file'
split_repository: 'bc-theme-file'
- local_path: 'bc-uploader'
split_repository: 'bc-uploader'
- local_path: 'bc-widget-area'
split_repository: 'bc-widget-area'
steps:
- uses: actions/checkout@v3

- name: Monorepo Tagged Split Stable
# タグと安定版のブランチを分割する
if: startsWith(github.ref, 'refs/tags/') && !contains(github.ref, '-')
uses: symplify/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
tag: ${GITHUB_REF#refs/tags/}
package_directory: 'plugins/${{ matrix.package.local_path }}'
repository_organization: 'baserproject'
repository_name: '${{ matrix.package.split_repository }}'
branch: "master"
user_name: "ryuring"
user_email: "[email protected]"

- name: Monorepo Tagged Split Alpha or Beta or Rc
# タグと開発版のブランチを分割する
if: startsWith(github.ref, 'refs/tags/') && contains(github.ref, '-')
uses: symplify/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
tag: ${GITHUB_REF#refs/tags/}
package_directory: 'plugins/${{ matrix.package.local_path }}'
repository_organization: 'baserproject'
repository_name: '${{ matrix.package.split_repository }}'
branch: "dev-5"
user_name: "ryuring"
user_email: "[email protected]"

- name: Monorepo Split Develop
# 開発版のブランチのみを分割する
if: "!startsWith(github.ref, 'refs/tags/')"
uses: symplify/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
package_directory: 'plugins/${{ matrix.package.local_path }}'
repository_organization: 'baserproject'
repository_name: '${{ matrix.package.split_repository }}'
branch: ${{ github.ref_name }}
user_name: "ryuring"
user_email: "[email protected]"
43 changes: 19 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"cakephp/cakephp-codesniffer": "^5.0",
"cakephp/debug_kit": "^5.0.0",
"phpunit/phpunit": "^10.1.0",
"symplify/monorepo-builder": "^10.2",
"symplify/monorepo-builder": "^11.2",
"vierge-noire/cakephp-fixture-factories": "^3.0",
"vierge-noire/cakephp-test-suite-light": "^3.0"
},
Expand All @@ -51,13 +51,11 @@
"BcInstaller\\": "plugins/bc-installer/src/",
"BcMail\\": "plugins/bc-mail/src/",
"BcSearchIndex\\": "plugins/bc-search-index/src/",
"BcSpaSample\\": "plugins/BcSpaSample/src/",
"BcThemeConfig\\": "plugins/bc-theme-config/src/",
"BcThemeFile\\": "plugins/bc-theme-file/src/",
"BcUploader\\": "plugins/bc-uploader/src/",
"BcWidgetArea\\": "plugins/bc-widget-area/src/",
"Cake\\Routing\\": "plugins/baser-core/src/Routing",
"SoftDelete\\": "plugins/cakephp-soft-delete/src"
"Cake\\Routing\\": "plugins/baser-core/src/Routing"
}
},
"autoload-dev": {
Expand All @@ -74,26 +72,25 @@
"BcThemeConfig\\Test\\": "plugins/bc-theme-config/tests/",
"BcThemeFile\\Test\\": "plugins/bc-theme-file/tests/",
"BcUploader\\Test\\": "plugins/bc-uploader/tests/",
"BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/",
"SoftDelete\\Test\\": "plugins/cakephp-soft-delete/tests"
"BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/"
}
},
"replace": {
"baserproject/baser-core": "5.0.8",
"baserproject/bc-admin-third": "5.0.8",
"baserproject/bc-blog": "5.0.8",
"baserproject/bc-content-link": "5.0.8",
"baserproject/bc-custom-content": "5.0.8",
"baserproject/bc-editor-template": "5.0.8",
"baserproject/bc-favorite": "5.0.8",
"baserproject/bc-front": "5.0.8",
"baserproject/bc-installer": "5.0.8",
"baserproject/bc-mail": "5.0.8",
"baserproject/bc-search-index": "5.0.8",
"baserproject/bc-theme-config": "5.0.8",
"baserproject/bc-theme-file": "5.0.8",
"baserproject/bc-uploader": "5.0.8",
"baserproject/bc-widget-area": "5.0.8"
"baserproject/baser-core": "5.0.19",
"baserproject/bc-admin-third": "5.0.19",
"baserproject/bc-blog": "5.0.19",
"baserproject/bc-content-link": "5.0.19",
"baserproject/bc-custom-content": "5.0.19",
"baserproject/bc-editor-template": "5.0.19",
"baserproject/bc-favorite": "5.0.19",
"baserproject/bc-front": "5.0.19",
"baserproject/bc-installer": "5.0.19",
"baserproject/bc-mail": "5.0.19",
"baserproject/bc-search-index": "5.0.19",
"baserproject/bc-theme-config": "5.0.19",
"baserproject/bc-theme-file": "5.0.19",
"baserproject/bc-uploader": "5.0.19",
"baserproject/bc-widget-area": "5.0.19"
},
"scripts": {
"post-install-cmd": "App\\Console\\Installer::postInstall",
Expand Down Expand Up @@ -123,7 +120,5 @@
"cakephp/plugin-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
}
Loading

0 comments on commit e2d0034

Please sign in to comment.