From c552021c35edca444ede0ade2541a97526e8b093 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Wed, 18 Jun 2025 17:48:34 +0200 Subject: [PATCH 1/8] fix: change back to columns --- .../ContentBlocks/ContentElements/imagegallery/config.yaml | 3 +-- .../imagegallery/templates/backend-preview.html | 2 +- .../ContentElements/imagegallery/templates/frontend.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml b/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml index f479dd5..5efef46 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/config.yaml @@ -11,8 +11,7 @@ fields: allowed: [jpg, jpeg, png, gif, webp] multiple: true useExistingField: true - - identifier: imagecols - useExistingField: true + - identifier: columns type: Select renderType: selectSingle default: 1 diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html index 838f0b3..7e956b6 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/backend-preview.html @@ -24,7 +24,7 @@

- + 2 Columns 3 Columns 5 Columns diff --git a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html index f74618d..90e43e3 100644 --- a/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/imagegallery/templates/frontend.html @@ -7,7 +7,7 @@ - + md:grid-cols-2 md:grid-cols-3 md:grid-cols-5 From b65377dee49e5e6ecc2d31a2f2ee1207bbf5d592 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Mon, 23 Jun 2025 16:54:04 +0200 Subject: [PATCH 2/8] fix: update card image styling for improved visibility and layout --- .../card_container/templates/frontend.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html b/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html index db56da1..fc21f5d 100644 --- a/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html +++ b/packages/base/ContentBlocks/ContentElements/card_container/templates/frontend.html @@ -25,7 +25,7 @@

- + -
+
-

{card.header}

+

{card.header}

@@ -72,7 +72,7 @@
-

{card.header}

+

{card.header}

{card.bodytext}
From 71d06aabd6ae25f42e795c556add304bc81e0189 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Mon, 23 Jun 2025 17:10:43 +0200 Subject: [PATCH 3/8] fix: flush cache before extension:setup --- build/deploy.php | 1 + 1 file changed, 1 insertion(+) diff --git a/build/deploy.php b/build/deploy.php index 05c9efb..1284920 100644 --- a/build/deploy.php +++ b/build/deploy.php @@ -117,6 +117,7 @@ task('deploy', [ 'deploy:vendors', 'deploy:shared', 'deploy:writable', + 'typo3:cache:flush', 'typo3:extension:setup', 'deploy:symlink', 'php:reload', From 080bf9e186fce4efcda004836da9d8e21864371c Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Mon, 23 Jun 2025 17:19:24 +0200 Subject: [PATCH 4/8] fix: flush cache at deployment --- build/deploy.php | 1 + 1 file changed, 1 insertion(+) diff --git a/build/deploy.php b/build/deploy.php index 1284920..ed3cdfa 100644 --- a/build/deploy.php +++ b/build/deploy.php @@ -94,6 +94,7 @@ task('release:create', [ 'deploy:vendors', 'deploy:shared', 'deploy:writable', + 'typo3:cache:flush', 'typo3:extension:setup', 'deploy:unlock', 'deploy:success' From b6ba7f24fe1dfcb6efd971bda8bbc54a4df9b7c6 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Thu, 26 Jun 2025 09:47:50 +0200 Subject: [PATCH 5/8] feat: deploy to production --- .gitea/workflows/deploy.yaml | 52 +++++++++++++++++------------------ .gitea/workflows/release.yaml | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 9366139..458608f 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - PHP_VERSION: '8.3' # set this to the PHP version to use + PHP_VERSION: '8.4' # set this to the PHP version to use COMPOSER_ALLOW_SUPERUSER: 1 permissions: @@ -102,28 +102,28 @@ jobs: dep: --file=./build/deploy.php release:switch stage private-key: ${{secrets.STAGE_KEY}} - # deploy-production: - # needs: build - # runs-on: ubuntu-latest - # steps: - # - name: Setup PHP - # uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc - # with: - # php-version: ${{ env.PHP_VERSION }} - # - uses: actions/download-artifact@v3 - # with: - # name: typo3 - # - name: Extract artifact - # run: | - # tar xf typo3.tar.gz - # rm typo3.tar.gz - # - name: Install ssh agent and rsync - # run: | - # apt update - # apt install -y openssh-client rsync - # - name: Deploy - # uses: deployphp/action@v1 - # with: - # deployer-binary: "./bin/dep" - # dep: --file=./build/deploy.php release:create production - # private-key: ${{secrets.PROD_KEY}} + deploy-production: + needs: build + runs-on: ubuntu-latest + steps: + - name: Setup PHP + uses: shivammathur/setup-php@7c0b4c8c8ebed23eca9ec2802474895d105b11bc + with: + php-version: ${{ env.PHP_VERSION }} + - uses: actions/download-artifact@v3 + with: + name: typo3 + - name: Extract artifact + run: | + tar xf typo3.tar.gz + rm typo3.tar.gz + - name: Install ssh agent and rsync + run: | + apt update + apt install -y openssh-client rsync + - name: Deploy + uses: deployphp/action@v1 + with: + deployer-binary: "./bin/dep" + dep: --file=./build/deploy.php release:create production + private-key: ${{secrets.PROD_KEY}} diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index e433f47..b61e0bf 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -6,7 +6,7 @@ on: - 'v*.*' # Adjust this pattern based on your tagging env: - PHP_VERSION: '8.3' # set this to the PHP version to use + PHP_VERSION: '8.4' # set this to the PHP version to use COMPOSER_ALLOW_SUPERUSER: 1 permissions: From 177d79ceb1e11173f28aac259b87ff2661bc78f2 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Thu, 26 Jun 2025 10:04:43 +0200 Subject: [PATCH 6/8] fix: change php version for deployment --- .gitea/workflows/deploy.yaml | 2 +- .gitea/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 458608f..fa5add0 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - PHP_VERSION: '8.4' # set this to the PHP version to use + PHP_VERSION: '8.3' # set this to the PHP version to use COMPOSER_ALLOW_SUPERUSER: 1 permissions: diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index b61e0bf..e433f47 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -6,7 +6,7 @@ on: - 'v*.*' # Adjust this pattern based on your tagging env: - PHP_VERSION: '8.4' # set this to the PHP version to use + PHP_VERSION: '8.3' # set this to the PHP version to use COMPOSER_ALLOW_SUPERUSER: 1 permissions: From 9720b9328e7fda73022607ea6c523cf3c7aaec23 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Thu, 26 Jun 2025 11:55:16 +0200 Subject: [PATCH 7/8] fix: change to apt-get and change cache:flush to release from current, to work on first release --- .gitea/workflows/deploy.yaml | 12 ++++++------ .gitea/workflows/release.yaml | 4 ++-- build/deploy.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index fa5add0..96edb1e 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -68,8 +68,8 @@ jobs: rm typo3.tar.gz - name: Install ssh agent and rsync run: | - apt update - apt install -y openssh-client rsync + apt-get update + apt-get install -y openssh-client rsync - name: Upload release uses: deployphp/action@v1 with: @@ -93,8 +93,8 @@ jobs: rm typo3.tar.gz - name: Install ssh agent and rsync run: | - apt update - apt install -y openssh-client rsync + apt-get update + apt-get install -y openssh-client rsync - name: Switch to release uses: deployphp/action@v1 with: @@ -119,8 +119,8 @@ jobs: rm typo3.tar.gz - name: Install ssh agent and rsync run: | - apt update - apt install -y openssh-client rsync + apt-get update + apt-get install -y openssh-client rsync - name: Deploy uses: deployphp/action@v1 with: diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index e433f47..434daa6 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -26,8 +26,8 @@ jobs: composer validate --no-check-publish && composer install --prefer-dist --no-progress --ignore-platform-reqs - name: Install ssh agent, rsync run: | - apt update - apt install -y openssh-client rsync + apt-get update + apt-get install -y openssh-client rsync - name: Switch to release uses: deployphp/action@v1 with: diff --git a/build/deploy.php b/build/deploy.php index ed3cdfa..e7702b6 100644 --- a/build/deploy.php +++ b/build/deploy.php @@ -56,7 +56,7 @@ set('rsync', [ ]); task('typo3:cache:flush', function() { - cd('current'); + cd('{{release_path}}'); run('{{bin/php}} bin/typo3 cache:flush'); }); From 9d4fad0889e8bf5919d7e42e5f2b5372c54b1536 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Thu, 26 Jun 2025 12:16:30 +0200 Subject: [PATCH 8/8] fix: change back to current and make first release manual --- build/deploy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/deploy.php b/build/deploy.php index e7702b6..ed3cdfa 100644 --- a/build/deploy.php +++ b/build/deploy.php @@ -56,7 +56,7 @@ set('rsync', [ ]); task('typo3:cache:flush', function() { - cd('{{release_path}}'); + cd('current'); run('{{bin/php}} bin/typo3 cache:flush'); });