From a07f35c38444c4a98b6da5b6bd87dd2cf53a2de5 Mon Sep 17 00:00:00 2001
From: nigeljamesstevenson
 <105309450+nigeljamesstevenson@users.noreply.github.com>
Date: Fri, 3 Nov 2023 11:40:55 +0000
Subject: [PATCH] Revert "Branch to test sadow pr 41200"

---
 .github/workflows/milestoned.yml              | 25 -------------------
 .../pull-request-post-merge-processing.yml    |  4 ++-
 .../tests/coupons/coupons.test.js             |  2 +-
 3 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 .github/workflows/milestoned.yml

diff --git a/.github/workflows/milestoned.yml b/.github/workflows/milestoned.yml
deleted file mode 100644
index 8a24134c519..00000000000
--- a/.github/workflows/milestoned.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Milestone Manager
-
-on:
-    pull_request_target:
-        types: [milestoned]
-
-permissions: {}
-
-jobs:
-    remove-milestone-from-unmerged-prs:
-        name: "Remove Milestone from Unmerged PRs"
-        if: github.event.pull_request.merged != true
-        runs-on: ubuntu-latest
-        permissions:
-            issues: write
-        steps:
-            - uses: actions/github-script@v6
-              with:
-                  script: |
-                      github.rest.issues.update({
-                          owner: context.repo.owner,
-                          repo: context.repo.repo,
-                          issue_number: context.payload.pull_request.number,
-                          milestone: null,
-                      });
diff --git a/.github/workflows/pull-request-post-merge-processing.yml b/.github/workflows/pull-request-post-merge-processing.yml
index dea0dab0de6..7e8073f6a1c 100644
--- a/.github/workflows/pull-request-post-merge-processing.yml
+++ b/.github/workflows/pull-request-post-merge-processing.yml
@@ -38,7 +38,9 @@ jobs:
               with:
                   php-version: '7.4'
             - name: 'Run the script to assign a milestone'
-              if: github.event.pull_request.base.ref == 'trunk'
+              if: |
+                  !github.event.pull_request.milestone &&
+                  github.event.pull_request.base.ref == 'trunk'
               run: php assign-milestone-to-merged-pr.php
               env:
                   PULL_REQUEST_ID: ${{ github.event.pull_request.node_id }}
diff --git a/plugins/woocommerce/tests/api-core-tests/tests/coupons/coupons.test.js b/plugins/woocommerce/tests/api-core-tests/tests/coupons/coupons.test.js
index cd176837c7d..c43bc6066b7 100644
--- a/plugins/woocommerce/tests/api-core-tests/tests/coupons/coupons.test.js
+++ b/plugins/woocommerce/tests/api-core-tests/tests/coupons/coupons.test.js
@@ -1,6 +1,6 @@
 const { test, expect } = require( '@playwright/test' );
 const { coupon, order } = require( '../../data' );
-// update for PR test sadow 41200
+
 /**
  * Tests for the WooCommerce Coupons API.
  *