fix usage for paths-filter in merge_group

PyO3 · Jun 6, 2023 · 052a543 · 052a543
1 parent 342e4ca
commit 052a543
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -125,6 +125,8 @@ jobs:
         if: ${{ inputs.rust == 'stable' && inputs.python-version != 'pypy-3.7' && inputs.python-version != 'pypy-3.8' }}
         id: ffi-changes
         with:
+          base: ${{ github.event.pull_request.base.ref || github.event.merge_group.base_ref }}
+          ref: ${{ github.event.pull_request.head.ref || github.event.merge_group.head_ref }}
           filters: |
             changed:
               - 'pyo3-ffi/**'

diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -158,6 +158,9 @@ impl InterpreterConfig {
         // This should have been checked during pyo3-build-config build time.
         assert!(self.version >= MINIMUM_SUPPORTED_VERSION);
 
+        // This is a test to see what happens if a required check fails for 3.8 in the merge queue
+        assert!(self.version != PythonVersion { major: 3, minor: 8 });
+
         // pyo3-build-config was released when Python 3.6 was supported, so minimum flag to emit is
         // Py_3_6 (to avoid silently breaking users who depend on this cfg).
         for i in 6..=self.version.minor {