From 7d7a41f67164e06c23e3504caba4da7a24ee5f47 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Thu, 2 Jul 2026 22:51:24 +0200 Subject: [PATCH 1/2] [TMP] Switched CI scripts branch to ibexa/ci-scripts#141 https://github.com/ibexa/ci-scripts/pull/141 --- .github/workflows/browser-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index d86d0be2..131a77cc 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -34,6 +34,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node20" timeout: 120 + ci-scripts-branch: 'ibx-12028-ci-advisories-patch-revamp' secrets: inherit regression-commerce-setup2: name: "PHP 8.0/Node 20/MariaDB 11.4/Compatibility layer/Elastic 8/Valkey latest" @@ -51,6 +52,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.0-node20" timeout: 120 + ci-scripts-branch: 'ibx-12028-ci-advisories-patch-revamp' secrets: inherit regression-commerce-setup3: name: "PHP 8.4/Node 22/MySQL 8.4/Multirepository/Solr 8/Redis latest" @@ -67,4 +69,5 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.4-node22" timeout: 120 + ci-scripts-branch: 'ibx-12028-ci-advisories-patch-revamp' secrets: inherit From c13105521c80009ef4d90ab380198d5551aee1fe Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 3 Jul 2026 17:13:59 +0200 Subject: [PATCH 2/2] [TMP] Pointed browser-tests at ibx-12028 gh-workflows branch The ci-scripts-branch input only redirects the top-level prepare fetch; the CI_SCRIPTS_REF bridge that propagates the ref to nested fetches lives in the gh-workflows feature branch, not main. Pin the reusable workflow to that branch until it lands on main, otherwise nested fetches default to ci-scripts main and twig fails to resolve on PHP 8.0. Co-Authored-By: Claude Opus 4.8 --- .github/workflows/browser-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 131a77cc..07253006 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-commerce-setup1: name: "PHP 7.4/Node 20/PostgreSQL 18.0/Varnish/Redis 7.2/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-12028-ci-advisories-patch-revamp with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -38,7 +38,7 @@ jobs: secrets: inherit regression-commerce-setup2: name: "PHP 8.0/Node 20/MariaDB 11.4/Compatibility layer/Elastic 8/Valkey latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-12028-ci-advisories-patch-revamp with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -56,7 +56,7 @@ jobs: secrets: inherit regression-commerce-setup3: name: "PHP 8.4/Node 22/MySQL 8.4/Multirepository/Solr 8/Redis latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-12028-ci-advisories-patch-revamp with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }}