From 6524573ab30f5cd2fa24ad6c343d290d32c50899 Mon Sep 17 00:00:00 2001
From: Kim Pohas <kpohas@sumologic.com>
Date: Wed, 13 May 2026 14:43:53 -0700
Subject: [PATCH 1/2] Revert "Fix: Restore --exclude="cid.php" in rsync deploy
 command (#6650)"

This reverts commit ba7f6dd9d4b9354d746c51a4bb528b775527f278.
---
 .github/workflows/job_pantheon.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/job_pantheon.yml b/.github/workflows/job_pantheon.yml
index 96040ea16e..066c1dadb8 100644
--- a/.github/workflows/job_pantheon.yml
+++ b/.github/workflows/job_pantheon.yml
@@ -90,7 +90,7 @@ jobs:
       - name: Commit build and deploy to Pantheon repo
         run: |
           terminus local:clone --yes --branch="${{ env.PANTHEON_BRANCH }}" ${{ inputs.PANTHEON_SITE_ID }}
-          rsync --archive --delete --exclude="cid.php" ./build/ "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}"
+          rsync --archive --delete ./build/ "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}"
           chmod -R 755 $HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}
           git -C "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}" add .
           git -C "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}" commit -m "Added content from ${{ github.repository }} at ${{ github.sha }}"

From 9e703b9065fda3018d96790e148761ec5549cff6 Mon Sep 17 00:00:00 2001
From: Kim Pohas <kpohas@sumologic.com>
Date: Wed, 13 May 2026 14:43:56 -0700
Subject: [PATCH 2/2] Revert "Fix: Remove redundant PHP/Composer install from
 job_pantheon.yml (#6648)"

This reverts commit 4efc8357624a806d75eb38fafd673a88dbfdd65e.
---
 .github/workflows/job_pantheon.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/job_pantheon.yml b/.github/workflows/job_pantheon.yml
index 066c1dadb8..f8db3fa990 100644
--- a/.github/workflows/job_pantheon.yml
+++ b/.github/workflows/job_pantheon.yml
@@ -57,7 +57,13 @@ jobs:
           php-version: "8.2"
       - name: Install Terminus
         run: |
-          sudo apt-get install -y --no-install-recommends jq
+          sudo apt update
+          sudo apt install -y curl php-common php-cli php-xml php-mbstring php-curl git jq
+          php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+          php -r "if (hash_file('sha384', 'composer-setup.php') === file_get_contents('https://composer.github.io/installer.sig')) { echo 'Installer verified'.PHP_EOL; } else { echo 'Installer corrupt'.PHP_EOL; unlink('composer-setup.php'); exit(1); }"
+          php composer-setup.php
+          php -r "unlink('composer-setup.php');"
+          mv composer.phar /usr/local/bin/composer
           curl -L https://github.com/pantheon-systems/terminus/releases/download/4.0.3/terminus.phar --output terminus
           chmod +x terminus
           mv terminus /usr/local/bin/terminus
@@ -90,7 +96,7 @@ jobs:
       - name: Commit build and deploy to Pantheon repo
         run: |
           terminus local:clone --yes --branch="${{ env.PANTHEON_BRANCH }}" ${{ inputs.PANTHEON_SITE_ID }}
-          rsync --archive --delete ./build/ "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}"
+          rsync --archive --delete --exclude="cid.php" ./build/ "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}"
           chmod -R 755 $HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}/${{ inputs.SITE_PATH }}
           git -C "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}" add .
           git -C "$HOME/pantheon-local-copies/${{ inputs.PANTHEON_SITE_ID }}" commit -m "Added content from ${{ github.repository }} at ${{ github.sha }}"