Skip to content

Commit

Permalink
Merge branch 'master' into 12.4
Browse files Browse the repository at this point in the history
  • Loading branch information
hannesbochmann committed Sep 2, 2024
2 parents f5f8628 + f55d9ff commit 6f022fe
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 68 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: TER release

on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'

jobs:
release:
name: TYPO3 TER release

if: startsWith(github.ref, 'refs/tags/')

runs-on: ubuntu-20.04

env:
TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Get version
id: get-version
run: echo ::set-output name=version::$(echo "${{ github.event.ref }}" | cut -d 'v' -f 2)

- name: Get comment
id: get-comment
run: echo ::set-output name=comment::Released version ${{ steps.get-version.outputs.version }}. Check changelog in documentation on github for more information.

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
extensions: intl, mbstring, json, zip, curl

- name: Install tailor
run: composer global require typo3/tailor --prefer-dist --no-progress

- name: Publish to TER
run: php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ steps.get-comment.outputs.comment }}" ${{ steps.get-version.outputs.version }}
2 changes: 1 addition & 1 deletion Classes/Command/CleanerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected function configure(): void
->addArgument(
'foldersToClean',
InputArgument::IS_ARRAY | InputArgument::REQUIRED,
'Which Folders should be cleaned (separate multiple folders with a space)?'
'Which Folders should be cleaned (combined folder identifiers separated by space for example 1:myfolder/)?'
);
}

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ to security so no sensitive information is leaked.
This is done with mat2 (https://0xacab.org/jvoisin/mat2), exiftool (https://exiftool.org/) and qpdf (https://github.com/qpdf/qpdf)
in the moment. You need to install/provide those commands on the server CLI.
If some command is not available system-wide the path
can be configured with `$GLOBALS['TYPO3_CONF_VARS']['SYS']['binSetup']` or
can be configured with `$GLOBALS['TYPO3_CONF_VARS']['SYS']['binSetup']` or
`$GLOBALS['TYPO3_CONF_VARS']['SYS']['binPath']`.

Check the logs for errors after uploading files etc.
Expand All @@ -31,12 +31,12 @@ A custom cleaner can be added in `ext_localconf.php` like this:
\DMK\Mkcleaner\Cleaner\Registry::registerCleaner(\Vendor\Package\Cleaner\CustomCleaner::class, 100);
```

Every cleaner needs to implement `DMK\Mkcleaner\Cleaner\CleanerInterface`. Please take a look at the
Every cleaner needs to implement `DMK\Mkcleaner\Cleaner\CleanerInterface`. Please take a look at the
existing cleaners.

Drawbacks
----------------
Please keep in mind that neither of the tools is perfect and might break files or leave metadata present.
Please keep in mind that neither of the tools is perfect and might break files or leave metadata present.
For example pdf files sometimes loose all links or svg files have changed content when mat2 would
be used.
Therefore pdf files are cleaned with exiftool and qpdf instead of mat2 and svg files are omitted
Expand Down
14 changes: 0 additions & 14 deletions Resources/Private/Language/de.locallang_csh.xlf

This file was deleted.

14 changes: 0 additions & 14 deletions Resources/Private/Language/locallang_csh.xlf

This file was deleted.

36 changes: 0 additions & 36 deletions ext_tables.php

This file was deleted.

0 comments on commit 6f022fe

Please sign in to comment.