Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add cla check #203

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/.github export-ignore
/docs export-ignore
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/codeception.dist.yml export-ignore
/phpstan.neon export-ignore
/ecs.php export-ignore
/CLA.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/ISSUE_TEMPLATE.md export-ignore
/PULL_REQUEST_TEMPLATE.md export-ignore
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: write
pull-requests: write
statuses: write

jobs:
cla-assistant:
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/[email protected]
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/dachcom-digital/pimcore-members/blob/master/CLA.md'
branch: 'main'
allowlist: bot*
remote-organization-name: 'dachcom-digital'
remote-repository-name: 'cla'
23 changes: 13 additions & 10 deletions .github/workflows/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.2 ]
symfony: [ ^6.2 ]
pimcore: [ ~11.3.0 ]
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.3.0
template_tag: v11.0.0
- pimcore: ~11.4.0
template_tag: 2024.3
steps:
- uses: actions/checkout@v2
- uses: nanasess/setup-chromedriver@v2
- uses: actions/checkout@v4
with:
path: lib/test-bundle

Expand Down Expand Up @@ -98,7 +99,9 @@ jobs:

- name: Setup Chromium
run: |
nohup $CHROMEWEBDRIVER/chromedriver --url-base=/wd/hub /dev/null 2>&1 &
export DISPLAY=:99
chromedriver --url-base=/wd/hub --port=9515 &
sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &

- name: Start Symfony Server
run: |
Expand All @@ -108,10 +111,10 @@ jobs:
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Downloads
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -136,7 +139,7 @@ jobs:
vendor/bin/codecept run --env github -c ${{ github.workspace }}/lib/test-bundle

- name: Log Output
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: "Logs (PHP ${{ matrix.php }}, Pimcore ${{ matrix.pimcore }}, Symfony ${{ matrix.symfony }})"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.2 ]
symfony: [ ^6.2 ]
pimcore: [ ~11.3.0 ]
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.3.0
template_tag: v11.0.0
- pimcore: ~11.4.0
template_tag: 2024.3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
path: lib/test-bundle

Expand Down Expand Up @@ -88,10 +88,10 @@ jobs:
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Downloads
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/php-stan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: [ 8.2 ]
symfony: [ ^6.2 ]
pimcore: [ ~11.3.0 ]
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.3.0
template_tag: v11.0.0
- pimcore: ~11.4.0
template_tag: 2024.3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
path: lib/test-bundle

Expand Down Expand Up @@ -88,10 +88,10 @@ jobs:
- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Downloads
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand All @@ -110,6 +110,10 @@ jobs:
run: |
bin/console assets:install public --relative --symlink

- name: Validate Container
run: |
bin/console lint:container

- name: Php Stan
run: |
bin/console cache:warmup --env=test
Expand Down
36 changes: 36 additions & 0 deletions CLA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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 DACHCOM.DIGITAL AG 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 DACHCOM.DIGITAL AG, 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 DACHCOM.DIGITAL AG 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 DACHCOM.DIGITAL AG 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.
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

<!--
- Please fill in this template according to your issue.
- For support request or how-tos, visit https://gitter.im/pimcore/pimcore or https://talk.pimcore.org/
- For support request or how-tos, visit the discussions section.
- Otherwise, replace this comment by the description of your issue.
-->
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ Learn more about the Members Restriction feature:
## Upgrade Info
Before updating, please [check our upgrade notes!](UPGRADE.md)

## Copyright and license
Copyright: [DACHCOM.DIGITAL](http://dachcom-digital.ch)
## License
**DACHCOM.DIGITAL AG**, Löwenhofstrasse 15, 9424 Rheineck, Schweiz
[dachcom.com](https://www.dachcom.com), [email protected]
Copyright © 2024 DACHCOM.DIGITAL. All rights reserved.

For licensing details please visit [LICENSE.md](LICENSE.md)
2 changes: 1 addition & 1 deletion tests/_envs/local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ modules:
wait: 1
capabilities:
chromeOptions:
args: ['--no-sandbox', '--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1024,768']
args: ['--disable-extensions', '--headless', '--disable-gpu', '--disable-dev-shm-usage', '--window-size=1280,1024']
4 changes: 4 additions & 0 deletions tests/_etc/config/app/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ services:
- { name: kernel.event_subscriber }

doctrine:
orm:
entity_managers:
default:
connection: default
dbal:
connections:
default:
Expand Down
Loading