Skip to content

Commit f960cfe

Browse files
committed
Add TYPO3 v13 compatibility
1 parent 1be9be0 commit f960cfe

3 files changed

Lines changed: 36 additions & 17 deletions

File tree

.github/workflows/tasks.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: [ '8.1', '8.2', '8.3' ]
13-
typo3: [ '11', '12' ]
12+
php: [ '8.1', '8.2', '8.3', '8.4' ]
13+
typo3: [ '11', '12', '13' ]
1414
exclude:
1515
- php: '8.1'
1616
typo3: '13'
17+
- php: '8.4'
18+
typo3: '11'
1719
steps:
1820
- name: Setup PHP with PECL extension
1921
uses: shivammathur/setup-php@v2
2022
with:
2123
php-version: ${{ matrix.php }}
22-
- uses: actions/checkout@v2
23-
- uses: actions/cache@v3
24+
- uses: actions/checkout@v4
25+
- uses: actions/cache@v4
2426
with:
2527
path: ~/.composer/cache/files
26-
key: ${{ runner.os }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
28+
key: ${{ runner.os }}-${{ matrix.php }}
2729
restore-keys: |
2830
${{ runner.os }}-${{ matrix.php }}-composer-
29-
- run: composer require typo3/minimal="^${{ matrix.typo3 }}" -W --dev
30-
- run: composer install --no-interaction --no-progress
31+
- run: composer update --with typo3/minimal="^${{ matrix.typo3 }}" --no-interaction --no-progress -W --dev
3132
- run: ./vendor/bin/grumphp run --ansi
3233

3334
ter-release:

Makefile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
ACT_IMAGE ?= efrecon/act:v0.2.80
2+
WORKDIR ?= /work
3+
UID_GID := $(shell id -u):$(shell id -g)
4+
DOCKER_GID := $(shell stat -c '%g' /var/run/docker.sock)
5+
6+
PLATFORM ?= -P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-24.04
7+
8+
# Secrets-File in ENV format
9+
SECRETS ?= --secret-file .secrets
10+
11+
ACT_ARGS ?= \
12+
--artifact-server-path /home/act/.cache/artifacts
13+
14+
define DOCKER_RUN
15+
docker run --rm -it \
16+
-u $(UID_GID) \
17+
--group-add $(DOCKER_GID) \
18+
-e HOME=/home/act \
19+
-e XDG_CACHE_HOME=/home/act/.cache \
20+
-e ACT_CACHE_DIR=/home/act/.cache/actcache \
21+
-v /var/run/docker.sock:/var/run/docker.sock \
22+
-v $(PWD):$(WORKDIR) -w $(WORKDIR) \
23+
-v $$HOME/.cache:/home/act/.cache \
24+
$(ACT_IMAGE)
25+
endef
26+
27+
ci:
28+
$(DOCKER_RUN) $(PLATFORM) $(SECRETS) $(ACT_ARGS)

runTest.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)