Skip to content

Commit

Permalink
Merge branch '3.2' into 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dpfaffenbauer committed Sep 9, 2024
2 parents 69e281c + 36972ef commit f24c87a
Show file tree
Hide file tree
Showing 10 changed files with 128 additions and 160 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ name: Behat
on:
push:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'composer.json'
- 'features/**'
- 'behat.yml.dist'
- '*.php'
- 'src/**'
pull_request:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'composer.json'
- 'features/**'
- 'behat.yml.dist'
- '*.php'
- 'src/**'
release:
types: [ created ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs.yaml'
- 'README.md'
schedule:
- cron: "0 1 * * 1"

Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/behat_ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,21 @@ name: Behat UI
on:
push:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'composer.json'
- 'features/**'
- 'behat.yml.dist'
- '*.php'
- 'src/**'

pull_request:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'composer.json'
- 'features/**'
- 'behat.yml.dist'
- '*.php'
- 'src/**'
release:
types: [ created ]
schedule:
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/cla-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: CLA Check
on:
issue_comment:
types: [created]
pull_request_target:
types: [opened, closed, synchronize]

permissions:
actions: write
contents: read
pull-requests: write
statuses: write

jobs:
CLAAssistant:
runs-on: ubuntu-latest
steps:
- name: "CLA Assistant"
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
uses: contributor-assistant/github-action@v2.5.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }}
with:
path-to-signatures: 'signatures/version1/cla.json'
path-to-document: 'https://github.com/coreshop/coreshop/blob/3.2/CLA.md'
branch: "main"
allowlist: user1,bot*
remote-organization-name: "coreshop"
remote-repository-name: "cla"
7 changes: 3 additions & 4 deletions .github/workflows/gitsplit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ on:
- 3.0
- 3.1
- 4.0
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'src/CoreShop/Bundle/**'
- 'src/CoreShop/Component/**'
release:
types: [ published ]

Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/packages_bundles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ name: Packages Bundles
on:
push:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'src/CoreShop/Bundle/**'

pull_request:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'src/CoreShop/Bundle/**'

release:
types: [ created ]
schedule:
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/packages_components.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@ name: Packages Components
on:
push:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'src/CoreShop/Component/**'

pull_request:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'src/CoreShop/Component/**'

release:
types: [ created ]
schedule:
Expand Down
24 changes: 16 additions & 8 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ name: Static Tests (Lint, Stan)
on:
push:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'features/**'
- 'behat.yml.dist'
- 'src/**'
- '*.php'
- '*.neon'
- '*.xml'
- 'composer.json'
pull_request:
branches: [ '4.0' ]
paths-ignore:
- 'docs/**'
- '.github/workflows/docs_next.yml'
- 'README.md'
paths:
- 'features/**'
- 'behat.yml.dist'
- 'src/**'
- '*.php'
- '*.neon'
- '*.xml'
- 'composer.json'
release:
types: [ created ]
schedule:
Expand Down
109 changes: 0 additions & 109 deletions .github/workflows_tbd/behat_ui_pimcore.yml

This file was deleted.

42 changes: 42 additions & 0 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Contributor License Agreement

The following terms are used throughout this agreement:

**You** - the person or legal entity including its affiliates asked to accept this agreement. An affiliate is any entity
that controls or is controlled by the legal entity, or is under common control with it.

**Project** - is an umbrella term that refers to any and all coreshop open source projects.

**Contribution** - any type of work that is submitted to a Project, including any modifications or additions to existing
work.

Submitted - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or verbal
communication with coreshop, contributors or maintainers.

# 1. Grant of Copyright License.

Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
to coreshop a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such
derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.

# 2. Grant of Patent License.

Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
to coreshop a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions,
where such license applies only to those patent claims licensable by you that are necessarily infringed by your
contribution or by combination of your contribution with the project to which this contribution was submitted.

If any entity institutes patent litigation - including cross-claim or counterclaim in a lawsuit - against You alleging
that your contribution or any project it was submitted to constitutes or is responsible for direct or contributory
patent infringement, then any patent licenses granted to that entity under this agreement shall terminate as of the date
such litigation is filed.

# 3. Source of Contribution.

Your contribution is either your original creation, based upon previous work that, to the best of your knowledge, is
covered under an appropriate open source license and you have the right under that license to submit that work with
modifications, whether created in whole or in part by you, or you have clearly identified the source of the contribution
and any license or other restriction (like related patents, trademarks, and license agreements) of which you are
personally aware.
3 changes: 0 additions & 3 deletions crowdin.yml

This file was deleted.

0 comments on commit f24c87a

Please sign in to comment.