diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 8ab24bca85801..9e2c95dea7021 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -7,6 +7,10 @@ on:
         required: true
         description: "The SHA key for the commit we want to run over"
         type: string
+      is_presubmit:
+        required: true
+        description: "When enabled, only run presubmit tests"
+        type: boolean
 
 permissions:
   contents: read
@@ -365,10 +369,11 @@ jobs:
       matrix:
         include:
           # TODO: investigate and fix
-          # - name: MacOS CMake
-          #   os: macos-12
-          #   flags: -DCMAKE_CXX_STANDARD=14
-          #   cache-prefix: macos-cmake
+          - name: MacOS CMake
+             os: macos-12
+             flags: -DCMAKE_CXX_STANDARD=14
+             cache-prefix: macos-cmake
+             if: ${{ !inputs.is_presubmit }}
           - name: Windows CMake
             os: windows-2022
             flags: >-
diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml
index 70cfc27a4ad62..1eecca18dd0e0 100644
--- a/.github/workflows/test_runner.yml
+++ b/.github/workflows/test_runner.yml
@@ -77,6 +77,7 @@ jobs:
       # Store the sha for checkout so we can easily use it later.  For safe
       # events, this will be blank and use the defaults.
       checkout-sha: ${{ steps.safe-checkout.outputs.sha }}
+      is_presubmit: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
     steps:
       - name: Check
         # Trivially pass for safe PRs, and explicitly error for unsafe ones
@@ -123,6 +124,7 @@ jobs:
     uses: ./.github/workflows/test_cpp.yml
     with:
       safe-checkout: ${{ needs.check-tag.outputs.checkout-sha }}
+      is_presubmit: ${{ needs.check-tag.outputs.is_presubmit }}
     secrets: inherit
 
   java:
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 47eeb9012de59..8fbc3775bf5d7 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -9788,3 +9788,4 @@ Edition InternalFeatureHelper::GetEdition(const FileDescriptor& desc) {
 }  // namespace google
 
 #include "google/protobuf/port_undef.inc"
+// touch file