Skip to content

Commit 969f672

Browse files
eliashaeusslereliashaeussler
committed
Merge branch 'release/0.3.6'
2 parents 0dc7ae4 + e3d9173 commit 969f672

19 files changed

+395
-276
lines changed

‎.gitattributes

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
* text=auto
2-
/Tests export-ignore
3-
/.crowdin.yml export-ignore
4-
/.editorconfig export-ignore
5-
/.gitattributes export-ignore
6-
/.gitignore export-ignore
7-
/.gitlab-ci.yml export-ignore
8-
/.php_cs export-ignore
9-
/captainhook.json export-ignore
10-
/packaging_exclude.php export-ignore
11-
/phpstan.neon export-ignore
12-
/phpunit.coverage.xml export-ignore
13-
/phpunit.xml export-ignore
1+
* text=auto
2+
/.github export-ignore
3+
/Tests export-ignore
4+
/.crowdin.yaml export-ignore
5+
/.editorconfig export-ignore
6+
/.gitattributes export-ignore
7+
/.gitignore export-ignore
8+
/.php-cs-fixer.php export-ignore
9+
/captainhook.json export-ignore
10+
/packaging_exclude.php export-ignore
11+
/phpstan.neon export-ignore
12+
/phpunit.ci.xml export-ignore
13+
/phpunit.xml export-ignore
14+
/sonar-project.properties export-ignore

‎.github/CODE_OF_CONDUCT.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Code of conduct
2+
3+
The official [TYPO3 Code Of Conduct](https://typo3.org/community/values/code-of-conduct)
4+
applies to this project. Be respectful to each other!

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help improve the extension
4+
title: "[BUG]"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Description**
11+
A clear and concise description of what the bug is.
12+
13+
**Steps to reproduce**
14+
If possible, describe steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Environment**
24+
- TYPO3 version: [e.g. 10.4.17]
25+
- Extension version: [e.g. 0.3.2]
26+
- Composer Mode: [yes, no]
27+
- OS: [macOS 11.4, Windows 10]
28+
29+
**Additional context**
30+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this extension
4+
title: "[FEATURE]"
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎.github/workflows/cgl.yaml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: CGL
2+
on: [push, pull_request]
3+
4+
jobs:
5+
cgl:
6+
runs-on: ubuntu-18.04
7+
strategy:
8+
fail-fast: false
9+
steps:
10+
- uses: actions/checkout@v2
11+
with:
12+
fetch-depth: 0
13+
14+
# Prepare environment
15+
- name: Setup PHP
16+
uses: shivammathur/setup-php@v2
17+
with:
18+
php-version: 7.4
19+
tools: composer:v2
20+
21+
# Install dependencies
22+
- name: Install Composer dependencies
23+
run: composer install --no-progress
24+
25+
# Linting
26+
- name: Lint composer.json
27+
run: composer normalize --dry-run
28+
- name: Lint PHP
29+
run: composer lint:php -- --dry-run
30+
31+
# SCA
32+
- name: SCA PHP
33+
run: composer sca:php -- --error-format github

‎.github/workflows/release.yaml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: Release
2+
on:
3+
push:
4+
tags:
5+
- '*'
6+
7+
jobs:
8+
# Job: Create release
9+
release:
10+
if: startsWith(github.ref, 'refs/tags/')
11+
runs-on: ubuntu-18.04
12+
outputs:
13+
release-notes-url: ${{ steps.create-release.outputs.url }}
14+
steps:
15+
- uses: actions/checkout@v2
16+
with:
17+
fetch-depth: 0
18+
19+
# Check if tag is valid
20+
- name: Check tag
21+
run: |
22+
if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
23+
exit 1
24+
fi
25+
26+
# Create Changelog
27+
- name: Create changelog
28+
id: create-changelog
29+
uses: heinrichreimer/github-changelog-generator-action@v2.2
30+
with:
31+
token: ${{ secrets.GITHUB_TOKEN }}
32+
addSections: '{"documentation":{"prefix":"### Documentation","labels":["documentation"]},"feature":{"prefix":"### Added","labels":["feature"]}}'
33+
breakingLabel: "### Breaking"
34+
enhancementLabel: "### Changed"
35+
bugsLabel: "### Fixed"
36+
deprecatedLabel: "### Deprecated"
37+
removedLabel: "### Removed"
38+
securityLabel: "### Security"
39+
prLabel: "### Other pull requests"
40+
onlyLastTag: true
41+
issues: false
42+
issuesWoLabels: false
43+
pullRequests: true
44+
prWoLabels: true
45+
stripHeaders: false
46+
stripGeneratorNotice: true
47+
- name: Print changelog to console
48+
run: cat CHANGELOG.md
49+
50+
# Create release
51+
- name: Create release
52+
id: create-release
53+
uses: softprops/action-gh-release@v1
54+
with:
55+
token: ${{ secrets.GITHUB_TOKEN }}
56+
body: ${{ steps.create-changelog.outputs.changelog }}
57+
58+
# Job: Publish on TER
59+
ter-publish:
60+
if: startsWith(github.ref, 'refs/tags/')
61+
needs: [release]
62+
runs-on: ubuntu-18.04
63+
env:
64+
TYPO3_EXTENSION_KEY: warming
65+
TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}
66+
TYPO3_EXCLUDE_FROM_PACKAGING: packaging_exclude.php
67+
steps:
68+
- uses: actions/checkout@v2
69+
with:
70+
fetch-depth: 0
71+
72+
# Check if tag is valid
73+
- name: Check tag
74+
run: |
75+
if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
76+
exit 1
77+
fi
78+
79+
# Prepare version
80+
- id: get-version
81+
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
82+
- id: get-comment
83+
run: echo ::set-output name=comment::See release notes at ${{ needs.release.outputs.release-notes-url }}
84+
85+
# Prepare environment
86+
- name: Setup PHP
87+
uses: shivammathur/setup-php@v2
88+
with:
89+
php-version: 7.4
90+
extensions: intl, mbstring, json, zip, curl
91+
tools: composer:v2
92+
93+
# Install tailor
94+
- name: Install tailor
95+
run: composer global require typo3/tailor --prefer-dist --no-progress --no-suggest
96+
97+
- name: Publish to TER
98+
run: |
99+
git reset --hard HEAD && git clean -dfx
100+
php ~/.composer/vendor/bin/tailor set-version "${{ steps.get-version.outputs.version }}" --no-docs
101+
php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ steps.get-comment.outputs.comment }}" "${{ steps.get-version.outputs.version }}"

‎.github/workflows/tests.yaml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
name: Tests
2+
on: [push, pull_request]
3+
4+
jobs:
5+
tests:
6+
name: PHP ${{ matrix.php-version }} & TYPO3 ${{ matrix.typo3-version }}
7+
runs-on: ubuntu-18.04
8+
strategy:
9+
fail-fast: false
10+
matrix:
11+
include:
12+
- typo3-version: 10.4
13+
php-version: 7.3
14+
- typo3-version: 10.4
15+
php-version: 7.4
16+
- typo3-version: 11.5
17+
php-version: 7.4
18+
- typo3-version: 11.5
19+
php-version: 8.0
20+
coverage: 1
21+
steps:
22+
- uses: actions/checkout@v2
23+
with:
24+
fetch-depth: 0
25+
26+
# Prepare environment
27+
- name: Setup PHP
28+
uses: shivammathur/setup-php@v2
29+
with:
30+
php-version: ${{ matrix.php-version }}
31+
tools: composer:v2
32+
coverage: xdebug
33+
34+
# Define Composer cache
35+
- name: Get Composer cache directory
36+
id: composer-cache
37+
run: |
38+
echo "::set-output name=dir::$(composer config cache-files-dir)"
39+
- name: Define Composer cache
40+
uses: actions/cache@v2
41+
with:
42+
path: ${{ steps.composer-cache.outputs.dir }}
43+
key: tests-php-${{ matrix.php-version }}-typo3-${{ matrix.typo3-version }}
44+
restore-keys: |
45+
tests-php-${{ matrix.php-version }}-typo3-
46+
47+
# Install dependencies
48+
- name: Install TYPO3 and Composer dependencies
49+
run: composer require typo3/cms-core:"^${{ matrix.typo3-version }}" --no-progress
50+
51+
# Run tests
52+
- name: Run tests
53+
run: composer test:ci -- --coverage-text
54+
55+
# Report coverage
56+
- name: Fix coverage path
57+
working-directory: .Build/log/coverage
58+
run: sed -i 's/\/home\/runner\/work\/typo3-warming\/typo3-warming\//\/github\/workspace\//g' clover.xml
59+
if: ${{ matrix.coverage }}
60+
- name: Run SonarCloud scan
61+
uses: SonarSource/sonarcloud-github-action@master
62+
env:
63+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
65+
if: ${{ matrix.coverage }}
66+
67+
tests-lowest:
68+
name: '[test-lowest] PHP ${{ matrix.php-version }} & TYPO3 ${{ matrix.typo3-version }}'
69+
runs-on: ubuntu-18.04
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
include:
74+
- typo3-version: 10.4
75+
php-version: 7.3
76+
- typo3-version: 10.4
77+
php-version: 7.4
78+
- typo3-version: 11.5
79+
php-version: 7.4
80+
- typo3-version: 11.5
81+
php-version: 8.0
82+
steps:
83+
- uses: actions/checkout@v2
84+
with:
85+
fetch-depth: 0
86+
87+
# Prepare environment
88+
- name: Setup PHP
89+
uses: shivammathur/setup-php@v2
90+
with:
91+
php-version: ${{ matrix.php-version }}
92+
tools: composer:v2
93+
coverage: xdebug
94+
95+
# Define Composer cache
96+
- name: Get Composer cache directory
97+
id: composer-cache
98+
run: |
99+
echo "::set-output name=dir::$(composer config cache-files-dir)"
100+
- name: Define Composer cache
101+
uses: actions/cache@v2
102+
with:
103+
path: ${{ steps.composer-cache.outputs.dir }}
104+
key: tests-lowest-php-${{ matrix.php-version }}-typo3-${{ matrix.typo3-version }}
105+
restore-keys: |
106+
tests-lowest-php-${{ matrix.php-version }}-typo3-
107+
108+
# Install dependencies
109+
- name: Install TYPO3 and Composer dependencies
110+
run: composer require typo3/cms-core:"^${{ matrix.typo3-version }}" --prefer-lowest --no-progress
111+
112+
# Run tests
113+
- name: Run tests
114+
run: composer test:ci -- --coverage-text

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
/var/
44
/Resources/Private/Libs/Build/vendor
55
/Resources/Private/Libs/vendors.phar
6-
/.php_cs.cache
6+
/.php-cs-fixer.cache
77
/.phpunit.result.cache
88
/composer.lock

0 commit comments

Comments
 (0)