Skip to content

Commit

Permalink
add cla check
Browse files Browse the repository at this point in the history
  • Loading branch information
solverat committed Nov 18, 2024
1 parent 312dbce commit f509b82
Show file tree
Hide file tree
Showing 14 changed files with 313 additions and 291 deletions.
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-secure-storage/blob/master/CLA.md'
branch: 'main'
allowlist: bot*
remote-organization-name: 'dachcom-digital'
remote-repository-name: 'cla'
19 changes: 11 additions & 8 deletions .github/workflows/codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ jobs:
matrix:
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.3.0 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.3.0
template_tag: v2024.2.1
- 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,20 +99,22 @@ 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 Webserver and Chrome
- name: Start Symfony Server
run: |
curl -sS https://get.symfony.com/cli/installer | bash -s -- --install-dir=$HOME/.symfony/bin
~/.symfony/bin/symfony server:start --port=8080 --dir=public --allow-http --no-tls --daemon
- 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
50 changes: 50 additions & 0 deletions .github/workflows/ecs-fix.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Easy Coding Standards
on:
schedule:
- cron: '0 0 * * SUN'
workflow_dispatch: ~

jobs:
ecs-fix:
runs-on: ubuntu-latest
name: "Coding standard refactor"
timeout-minutes: 5
strategy:
fail-fast: false
matrix:
branch: [ '4.0' ]
steps:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3

- name: Composer install
run: composer install --no-interaction --no-scripts

- name: Run ECS
run: vendor/bin/ecs check --fix src --config src/ecs.php

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
commit-message: '[CS] Refactor'
author: DACHCOM Bot <[email protected]>
title: '[CS] Refactor'
body: |
This PR has been generated automatically to fix code-styles
labels: |
Enhancement
branch: coding-standard/refactor-${{ matrix.branch }}
delete-branch: true
base: ${{ matrix.branch }}


- name: Easy Coding Standard Check
continue-on-error: true
run: |
vendor/bin/ecs check ${{ github.workspace }}/lib/test-bundle/src --config ${{ github.workspace }}/lib/test-bundle/ecs.php
117 changes: 0 additions & 117 deletions .github/workflows/ecs.yml

This file was deleted.

16 changes: 10 additions & 6 deletions .github/workflows/php-stan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
matrix:
php: [ 8.3 ]
symfony: [ ^6.4 ]
pimcore: [ ~11.3.0 ]
pimcore: [ ~11.4.0 ]
include:
- pimcore: ~11.3.0
template_tag: v2024.2.1
- 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.
-->
46 changes: 30 additions & 16 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
# License
Copyright (C) 2024 DACHCOM.DIGITAL
# Contributor License Agreement

This software is available under the GNU General Public License version 3 (GPLv3).
The following terms are used throughout this agreement:

### GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:
- **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.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
## 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.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
## 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.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
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.

[GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html)
## 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.
Loading

0 comments on commit f509b82

Please sign in to comment.