Merge pull request #1523 from mongodb/merge-v1.17-into-master-1710159043560

Merge v1.17 into master

Author: jmikola

.evergreen/compile-unix.sh

@@ -65,12 +65,19 @@ esac
 # Report the current PHP version
 echo "PHP: `php --version | head -n 1`"
 
+# If we're testing a specific version of libmongoc, update submodule sources
+if [ -n "$LIBMONGOC_VERSION" ]; then
+   php scripts/update-submodule-sources.php
+fi
+
 phpize
 ./configure --enable-mongodb-developer-flags
 
-# If we're testing a specific version of libmongoc, regenerate the version file
+# configure relies on version information in libmongoc-version-current, but the target is not available until after calling configure
+# To work around this, run the make target, then run configure again
 if [ -n "$LIBMONGOC_VERSION" ]; then
    make libmongoc-version-current
+  ./configure --enable-mongodb-developer-flags
 fi
 
 make test TESTS="tests/smoketest.phpt"

.github/workflows/merge-up.yml

@@ -0,0 +1,34 @@
+name: Merge up
+
+on:
+  push:
+    branches:
+      - "v[0-9]+.[0-9]+"
+
+permissions:
+  contents: write
+  pull-requests: write
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  merge-up:
+    name: Create merge up pull request
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@v4
+        with:
+          # fetch-depth 0 is required to fetch all branches, not just the branch being built
+          fetch-depth: 0
+
+      - name: Create pull request
+        id: create-pull-request
+        uses: alcaeus/automatic-merge-up-action@main
+        with:
+          ref: ${{ github.ref_name }}
+          branchNamePattern: 'v<major>.<minor>'
+          fallbackBranch: 'master'