From 396f00a7875f19d3b443957dfc678de86692f571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 12:57:56 +0200 Subject: [PATCH 1/6] IBX-11797: [3.3] Bump Node to 20 --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c48fc83..9cd86f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,13 +27,13 @@ jobs: include: - php: "7.3" product-version: "~3.3.x-dev" - node: "14" + node: "20" - php: "7.4" product-version: "~3.3.x-dev" - node: "16" + node: "20" - php: "8.3" product-version: "~3.3.x-dev" - node: "18" + node: "20" - php: "7.4" product-version: "~4.6.x-dev" node: "18" From 897f022bbc793ace56967858fc1f3e33c6bdd109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 13:35:19 +0200 Subject: [PATCH 2/6] audit ignore --- bin/ci/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/ci/test.sh b/bin/ci/test.sh index dde1bb6..cecf350 100755 --- a/bin/ci/test.sh +++ b/bin/ci/test.sh @@ -45,6 +45,7 @@ if [ "$REUSE_VOLUME" = "0" ]; then ibexa_php:latest-node \ bash -c " composer --version && + composer config audit.ignore --json --merge \"{\"PKSA-2rbx-bjdx-4d4d\":\"lorem\"}\" && composer create-project --no-progress --no-interaction $COMPOSER_OPTIONS ibexa/website-skeleton /var/www $PRODUCT_VERSION && composer require ibexa/oss:$PRODUCT_VERSION -W --no-scripts $COMPOSER_OPTIONS git init && git add . && git commit -m 'Init' From 26dc7a5db1c1b33ad0297ed08be50faa309f8084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 14:06:39 +0200 Subject: [PATCH 3/6] fixup! audit ignore --- bin/ci/test.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/bin/ci/test.sh b/bin/ci/test.sh index cecf350..10948d0 100755 --- a/bin/ci/test.sh +++ b/bin/ci/test.sh @@ -45,7 +45,56 @@ if [ "$REUSE_VOLUME" = "0" ]; then ibexa_php:latest-node \ bash -c " composer --version && - composer config audit.ignore --json --merge \"{\"PKSA-2rbx-bjdx-4d4d\":\"lorem\"}\" && + add_audit_ignores() { + local reason=\$1 + shift + + for advisory in \"\$@\"; do + composer config audit.ignore --json --merge \"{\\\"\$advisory\\\":\\\"\$reason\\\"}\" + done + } + + PHP74_ADVISORIES=( + PKSA-xwpn-zs9j-6wy5 + PKSA-sf9j-1gs7-xzvx + PKSA-7h5p-prw9-w5nr + ) + + PHP74_PHP80_ADVISORIES=( + PKSA-5k7f-wvjj-jrgw + PKSA-sjvz-tbbr-vwth + PKSA-h8hf-ytnd-5t9q + PKSA-wwb1-81rc-pd65 + PKSA-hgmw-wn4d-hpcy + PKSA-kvv6-36cr-fkzb + PKSA-n14z-jjjg-g8vd + PKSA-3mcc-k66d-pydb + PKSA-gw7n-z4yx-7xjt + PKSA-dpx1-78wg-1kqs + PKSA-21g2-dzjv-sky5 + PKSA-v3kg-5xkr-pykw + PKSA-yhcn-xrg3-68b1 + PKSA-2wrf-1xmk-1pky + PKSA-6319-ffpf-gx66 + PKSA-n7sg-8f52-pqtf + PKSA-8kk8-h2xr-h5nx + PKSA-2rbx-bjdx-4d4d + PKSA-fs5b-x5k4-1h39 + ) + + PHP_VERSION=\"\$(php -r \"echo PHP_MAJOR_VERSION . \\\".\\\" . PHP_MINOR_VERSION;\")\" + + if [ \"\$PHP_VERSION\" = \"7.4\" ]; then + add_audit_ignores \ + \"The affected version of 3rd party component is installed on PHP 7.4. There is no alternative supporting PHP 7.4. Consider upgrading to PHP 8.1+\" \ + \"\${PHP74_ADVISORIES[@]}\" + fi + + if [ \"\$PHP_VERSION\" = \"7.3\" ] || [ \"\$PHP_VERSION\" = \"7.4\" ] || [ \"\$PHP_VERSION\" = \"8.0\" ]; then + add_audit_ignores \ + \"The affected version of 3rd party component is installed on PHP \${PHP_VERSION}. There is no alternative supporting PHP \${PHP_VERSION}. Consider upgrading to PHP 8.1+\" \ + \"\${PHP74_PHP80_ADVISORIES[@]}\" + fi && composer create-project --no-progress --no-interaction $COMPOSER_OPTIONS ibexa/website-skeleton /var/www $PRODUCT_VERSION && composer require ibexa/oss:$PRODUCT_VERSION -W --no-scripts $COMPOSER_OPTIONS git init && git add . && git commit -m 'Init' From f9bb6b9ab1b396afbb26166a3587e2338f97e4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 14:26:43 +0200 Subject: [PATCH 4/6] fixup! audit ignore --- bin/ci/test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/ci/test.sh b/bin/ci/test.sh index 10948d0..561b960 100755 --- a/bin/ci/test.sh +++ b/bin/ci/test.sh @@ -45,6 +45,8 @@ if [ "$REUSE_VOLUME" = "0" ]; then ibexa_php:latest-node \ bash -c " composer --version && + cd /var/www + add_audit_ignores() { local reason=\$1 shift From 5941d520731475ff6143bfa3139a7444992f9645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 14:42:25 +0200 Subject: [PATCH 5/6] fixup! audit ignore --- bin/ci/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci/test.sh b/bin/ci/test.sh index 561b960..4326722 100755 --- a/bin/ci/test.sh +++ b/bin/ci/test.sh @@ -45,6 +45,7 @@ if [ "$REUSE_VOLUME" = "0" ]; then ibexa_php:latest-node \ bash -c " composer --version && + composer create-project --no-progress --no-interaction $COMPOSER_OPTIONS ibexa/website-skeleton /var/www $PRODUCT_VERSION && cd /var/www add_audit_ignores() { @@ -97,7 +98,6 @@ if [ "$REUSE_VOLUME" = "0" ]; then \"The affected version of 3rd party component is installed on PHP \${PHP_VERSION}. There is no alternative supporting PHP \${PHP_VERSION}. Consider upgrading to PHP 8.1+\" \ \"\${PHP74_PHP80_ADVISORIES[@]}\" fi && - composer create-project --no-progress --no-interaction $COMPOSER_OPTIONS ibexa/website-skeleton /var/www $PRODUCT_VERSION && composer require ibexa/oss:$PRODUCT_VERSION -W --no-scripts $COMPOSER_OPTIONS git init && git add . && git commit -m 'Init' composer recipes:install ibexa/oss --force --reset -v From 2b86eadc5f6bb9fc58313f0489f3ff69ca728c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 25 May 2026 14:53:27 +0200 Subject: [PATCH 6/6] [4.6] Node 18 -> 20 due to sass 1.100.0 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9cd86f2..1805c27 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -36,7 +36,7 @@ jobs: node: "20" - php: "7.4" product-version: "~4.6.x-dev" - node: "18" + node: "20" - php: "8.0" product-version: "~4.6.x-dev" node: "20"