Deploy alpha (test fast-forward worklow)

.docker-hub/frontend/Dockerfile

@@ -1,5 +1,5 @@
 # build stage
-FROM node:lts-alpine@sha256:4d68856f48be7c73cd83ba8af3b6bae98f4679e14d1ff49e164625ae8831533a AS build-stage
+FROM node:lts-alpine@sha256:2175727cef5cad4020cb77c8c101d56ed41d44fbe9b1157c54f820e3d345eab1 AS build-stage
 
 COPY common /common
 

.docker-hub/print/Dockerfile

@@ -1,5 +1,5 @@
 # build stage
-FROM node:18.10.0@sha256:9d8a6466c6385e05f62f8ccf173e80209efb0ff4438f321f09ddf552b05af3ba AS build-stage
+FROM node:18.11.0@sha256:32b920f09c28e3b27c9c5620d843aab0d2bb2f46e7d0505686626ba20cb5da0e AS build-stage
 
 COPY common /common
 
@@ -13,7 +13,7 @@ ENV NODE_OPTIONS=--openssl-legacy-provider
 RUN npm run build
 
 # production stage
-FROM node:18.10.0@sha256:9d8a6466c6385e05f62f8ccf173e80209efb0ff4438f321f09ddf552b05af3ba AS production-stage
+FROM node:18.11.0@sha256:32b920f09c28e3b27c9c5620d843aab0d2bb2f46e7d0505686626ba20cb5da0e AS production-stage
 WORKDIR /app
 
 COPY --from=build-stage /app/node_modules ./node_modules

.github/workflows/continuous-integration.yml

@@ -43,7 +43,7 @@ jobs:
         run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
         working-directory: api
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -73,7 +73,7 @@ jobs:
         run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
         working-directory: api
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -103,7 +103,7 @@ jobs:
         run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
         working-directory: api
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -124,9 +124,9 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.10.0'
+          node-version: '18.11.0'
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -153,9 +153,9 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.10.0'
+          node-version: '18.11.0'
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -182,7 +182,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:13-alpine@sha256:fc3670fa23119159394dfdb98eee89b30ef5a506791aea6ff7d8a4e73a8cd4a4'
+        image: 'postgres:13-alpine@sha256:b5c7c10637b21dbbb8b30593cd91235ec06da12b56ebab8024b3def499d6ed15'
         env:
           POSTGRES_DB: 'ecamp3test'
           POSTGRES_PASSWORD: 'ecamp3'
@@ -209,7 +209,7 @@ jobs:
         run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
         working-directory: api
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -255,7 +255,7 @@ jobs:
 
     services:
       postgres:
-        image: 'postgres:13-alpine@sha256:fc3670fa23119159394dfdb98eee89b30ef5a506791aea6ff7d8a4e73a8cd4a4'
+        image: 'postgres:13-alpine@sha256:b5c7c10637b21dbbb8b30593cd91235ec06da12b56ebab8024b3def499d6ed15'
         env:
           POSTGRES_DB: 'ecamp3test'
           POSTGRES_PASSWORD: 'ecamp3'
@@ -282,7 +282,7 @@ jobs:
         run: 'echo "::set-output name=dir::$(composer config cache-files-dir)"'
         working-directory: api
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -306,9 +306,9 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.10.0'
+          node-version: '18.11.0'
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -344,9 +344,9 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '18.10.0'
+          node-version: '18.11.0'
 
-      - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+      - uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -417,7 +417,7 @@ jobs:
           cache-to: type=gha,scope=caddy,mode=max
 
       - name: Restore cache volumes (npm, composer)
-        uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
+        uses: actions/cache@1c73980b09e7aea7201f325a7aa3ad00beddcdda # tag=v3
         with:
           path: .cache
           key: docker-compose-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/composer.lock') }}
@@ -428,13 +428,13 @@ jobs:
       - run: docker-compose up -d php caddy frontend database docker-host
 
       # pull cypress while container are starting up
-      - run: docker pull cypress/included:10.9.0
+      - run: docker pull cypress/included:10.10.0
 
       # wait for backend & frontend to be up and running
       - run: bash wait-for-container-startup.sh
 
       # run end-to-end tests
-      - run: docker run -v $PWD:/e2e -w /e2e --network host -e CYPRESS_BASE_URL=http://localhost:3000 cypress/included:10.9.0
+      - run: docker run -v $PWD:/e2e -w /e2e --network host -e CYPRESS_BASE_URL=http://localhost:3000 cypress/included:10.10.0
         working-directory: frontend
 
       # print docker container logs (good for debugging; can be disabled again lateron)

.github/workflows/fast-forward.yml

@@ -2,25 +2,20 @@ name: Fast Forward Merge
 
 on:
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 jobs:
   fast_forward_job:
     name: Fast Forward
-    # Check this issue is a pull request
-    # Check the comment contains the trigger string
-    # Check the comment author has appropriate permissions
     if: |
-      (github.event.issue.pull_request != null) &&
-      contains(github.event.comment.body, '/fast-forward') &&
-      contains(github.event.comment.author_association, 'OWNER')
-
+      (github.event.issue.pull_request != '') &&
+      github.event.comment.body == '/fast-forward' &&
+      (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER')
     runs-on: ubuntu-latest
     steps:
-
       # To use this repository's private action, you must check out the repository
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Basic use case example
       - name: Fast Forward PR
@@ -30,16 +25,3 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           success_message: 'Success! Fast forwarded ***target_base*** to ***source_head***! ```git checkout target_base && git merge source_head --ff-only``` '
           failure_message: 'Failed! Cannot do fast forward!'
-      # Advanced use case example
-      # - name: Fast Forward PR
-      #   id: ff-action
-      #   uses: endre-spotlab/fast-forward-js-action@2.1
-      #   with:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #     success_message: 'Success! Fast forwarded ***target_base*** to ***source_head***! ```git checkout target_base && git merge source_head --ff-only``` '
-      #     failure_message: 'Failed! Cannot do fast forward!'
-      #     update_status: true
-      #     failure_message_same_stage_and_prod: 'Failed! Possible reasons: ***1)Your feature branch ```source_head``` is outdated***. You need to rebase ```git checkout source_head && git pull --rebase origin prod_branch && git push --force``` ***2)Review required***, pull-request is not approved ***3)Checks were not successful*** (build status check failed)'
-      #     failure_message_diff_stage_and_prod: 'Failed! Possible reasons: ***1)```stage_branch``` is currently in use***. Another feature validation is ongoing. You need to wait. Later, when integration finishes, you will need to rebase ```git checkout source_head && git pull --rebase origin prod_branch && git push --force``` ***2)Review required***, pull-request is not approved ***3)Checks were not successful*** (build status check failed)'
-      #     production_branch: 'master'
-      #     staging_branch: 'staging'

.nvmrc

@@ -1 +1 @@
-18.10.0
+18.11.0

api/Dockerfile

@@ -9,7 +9,7 @@
 ARG PHP_VERSION=8.1.11
 
 # renovate: datasource=docker depName=caddy
-ARG CADDY_VERSION=2.6.1
+ARG CADDY_VERSION=2.6.2
 
 # "php" stage
 FROM php:${PHP_VERSION}-fpm-alpine AS api_platform_php
@@ -103,6 +103,7 @@ COPY fixtures fixtures/
 COPY public public/
 COPY src src/
 COPY templates templates/
+COPY translations translations/
 
 RUN set -eux; \
 	mkdir -p var/cache var/log; \

api/composer.json

@@ -21,49 +21,49 @@
         "phpdocumentor/reflection-docblock": "5.3.0",
         "phpmyadmin/sql-parser": "5.5.0",
         "ramsey/uuid": "4.5.1",
-        "rize/uri-template": "0.3.4",
-        "sentry/sentry-symfony": "4.3.0",
+        "rize/uri-template": "0.3.5",
+        "sentry/sentry-symfony": "4.3.1",
         "stof/doctrine-extensions-bundle": "1.7.0",
         "swaggest/json-schema": "0.12.41",
         "symfony/asset": "6.1.5",
-        "symfony/console": "6.1.5",
+        "symfony/console": "6.1.6",
         "symfony/dotenv": "6.1.0",
-        "symfony/expression-language": "6.1.3",
+        "symfony/expression-language": "6.1.6",
         "symfony/flex": "2.2.3",
-        "symfony/framework-bundle": "6.1.5",
-        "symfony/intl": "6.1.0",
+        "symfony/framework-bundle": "6.1.6",
+        "symfony/intl": "6.1.6",
         "symfony/mailer": "6.1.5",
         "symfony/mercure-bundle": "0.3.5",
         "symfony/monolog-bundle": "3.8.0",
         "symfony/property-access": "6.1.3",
-        "symfony/property-info": "6.1.3",
+        "symfony/property-info": "6.1.6",
         "symfony/runtime": "6.1.3",
         "symfony/security-bundle": "6.1.3",
-        "symfony/serializer": "6.1.5",
-        "symfony/translation": "6.1.4",
+        "symfony/serializer": "6.1.6",
+        "symfony/translation": "6.1.6",
         "symfony/twig-bundle": "6.1.1",
-        "symfony/validator": "6.1.5",
-        "symfony/yaml": "6.1.4",
+        "symfony/validator": "6.1.6",
+        "symfony/yaml": "6.1.6",
         "webonyx/graphql-php": "14.11.8"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.11.0",
+        "friendsofphp/php-cs-fixer": "3.12.0",
         "hautelook/alice-bundle": "2.11.0",
         "justinrainbow/json-schema": "5.2.12",
         "php-coveralls/php-coveralls": "2.5.3",
-        "phpstan/phpstan": "1.8.8",
+        "phpstan/phpstan": "1.8.9",
         "phpunit/phpunit": "9.5.25",
-        "rector/rector": "0.14.5",
+        "rector/rector": "0.14.6",
         "symfony/browser-kit": "6.1.3",
         "symfony/css-selector": "6.1.3",
         "symfony/debug-bundle": "6.1.3",
-        "symfony/http-client": "6.1.5",
+        "symfony/http-client": "6.1.6",
         "symfony/maker-bundle": "1.47.0",
-        "symfony/phpunit-bridge": "6.1.3",
+        "symfony/phpunit-bridge": "6.1.6",
         "symfony/stopwatch": "6.1.5",
-        "symfony/var-dumper": "6.1.5",
-        "symfony/web-profiler-bundle": "6.1.5",
-        "vimeo/psalm": "4.28.0"
+        "symfony/var-dumper": "6.1.6",
+        "symfony/web-profiler-bundle": "6.1.6",
+        "vimeo/psalm": "4.29.0"
     },
     "config": {
         "optimize-autoloader": true,