From 097c6cc34b38f6559ead1231fbc9b456134e53c3 Mon Sep 17 00:00:00 2001 From: yogesh-compuco Date: Mon, 17 Jun 2024 17:51:09 +0530 Subject: [PATCH] SA-200: Update workflow to add patch for civicrm_drupal repo --- .github/workflows/patch.yml | 7 +++++++ .github/workflows/regen.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 8350c16014f6..ec8c8ae83764 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -23,6 +23,13 @@ jobs: wget https://storage.googleapis.com/civicrm/civicrm-stable/${base_version}/${civi_package} tar xzf ./${civi_package} -C to-be-patched + - name: Apply PR https://github.com/civicrm/civicrm-drupal/pull/681 + run: | + cd .. + rm -f to-be-patched/civicrm/drupal/modules/civicrm_member_roles/civicrm_member_roles.module + wget https://raw.githubusercontent.com/compucorp/civicrm-drupal/8037a4c636cf6f918f8c7fde5939febfeafe3143/modules/civicrm_member_roles/civicrm_member_roles.module + mv civicrm_member_roles.module to-be-patched/civicrm/drupal/modules/civicrm_member_roles/civicrm_member_roles.module + - name: Apply SMARTY MATH RCE patch "CIVI-SA-2023-07" run: | cd .. diff --git a/.github/workflows/regen.yml b/.github/workflows/regen.yml index 9489ad076e5b..33a041f382ed 100644 --- a/.github/workflows/regen.yml +++ b/.github/workflows/regen.yml @@ -73,7 +73,7 @@ jobs: echo "Cloning branch $BRANCHNAME from $GITHUB_SERVER_URL/$GITHUB_REPOSITORY" git clone -b $BRANCHNAME --depth 1 $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git civicrm cd civicrm - git clone -b 7.x-${{ github.event.inputs.civiver }} --depth 1 https://github.com/compucorp/civicrm-drupal.git drupal + git clone -b 7.x-${{ github.event.inputs.civiver }} --depth 1 https://github.com/civicrm/civicrm-drupal.git drupal git clone -b ${{ github.event.inputs.civiver }} --depth 1 https://github.com/civicrm/civicrm-packages.git packages COMPOSER_MEMORY_LIMIT=-1 composer install npm install