Merge remote-tracking branch 'origin/0.33.x' into fix-prevent-duplica…

…te-compression
utopia-php · Feb 3, 2025 · 193e15f · 193e15f
2 parents 0d535f3 + e91d4c5
commit 193e15f
Show file tree

Hide file tree

Showing 6 changed files with 394 additions and 171 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -12,5 +12,5 @@ jobs:
 
     - name: Run Linter
       run: |
-        docker run --rm -v $PWD:/app composer sh -c \
+        docker run --rm -v $PWD:/app composer:2.6 sh -c \
         "composer install --profile --ignore-platform-reqs && git config --global --add safe.directory /app && composer bench -- --progress=plain"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,6 +12,6 @@ jobs:
 
     - name: Run CodeQL
       run: |
-        docker run --rm -v $PWD:/app composer sh -c \
+        docker run --rm -v $PWD:/app composer:2.6 sh -c \
         "composer install --profile --ignore-platform-reqs && composer check"