PHPC-1994: Fix Evergreen testing for custom libmongoc versions

.evergreen/compile-unix.sh

@@ -2,29 +2,13 @@
 set -o errexit  # Exit the script with error if any of the commands fail
 
 # Supported/used environment variables:
-#       MARCH                   Machine Architecture. Defaults to lowercase uname -m
-#       RELEASE                 Use the fully qualified release archive
-
-RELEASE=${RELEASE:-no}
-
+#   MARCH             Machine Architecture. Defaults to lowercase uname -m
+#   LIBMONGOC_VERSION Optional libmongoc version (regenerate version file if set)
 
 # Automatically retrieve the machine architecture, lowercase, unless provided
 # as an environment variable (e.g. to force 32bit)
 [ -z "$MARCH" ] && MARCH=$(uname -m | tr '[:upper:]' '[:lower:]')
-
-# Get the kernel name, lowercased
-OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-echo "OS: $OS"
-
-# --strip-components is an GNU tar extension. Check if the platform
-# (e.g. Solaris) has GNU tar installed as `gtar`, otherwise we assume to be on
-# platform that supports it
-# command -v returns success error code if found and prints the path to it
-if command -v gtar 2>/dev/null; then
-   TAR=gtar
-else
-   TAR=tar
-fi
+echo "MARCH: $MARCH"
 
 # Any architecture specific configuration here
 case "$MARCH" in
@@ -39,6 +23,9 @@ case "$MARCH" in
    ;;
 esac
 
+# Get the kernel name, lowercased
+OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+echo "OS: $OS"
 
 # Operating system specific tweaks
 case "$OS" in
@@ -57,11 +44,15 @@ case "$OS" in
    ;;
 esac
 
-echo "MARCH: $MARCH"
-echo "RELEASE: $RELEASE"
-echo "OS: $OS"
-echo "PHP: $PHP_VERSION (`php --version | head -1`)"
+# Report the current PHP version
+echo "PHP: `php --version | head -1`"
 
 phpize
 ./configure --enable-mongodb-developer-flags
+
+# If we're testing a specific version of libmongoc, regenerate the version file
+if [ -n "$LIBMONGOC_VERSION" ]; then
+   make libmongoc-version-current
+fi
+
 make

.evergreen/config.yml

@@ -42,10 +42,11 @@ functions:
       params:
         working_dir: "src/src/libmongoc"
         script: |
-           if [ -n "$LIBMONGOC_VERSION" ]; then
+           if [ -n "${LIBMONGOC_VERSION}" ]; then
+              echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}"
               git fetch
-              git checkout $LIBMONGOC_VERSION
-              ../../build/calc_release_version.py
+              git checkout ${LIBMONGOC_VERSION}
+              # Note: compile-unix.sh will run `make libmongoc-version-current`
            fi
     # Applies the submitted patch, if any
     # Deprecated. Should be removed. But still needed for certain agents (ZAP)
@@ -114,6 +115,7 @@ functions:
 
               export PHP_VERSION="$PHP_VERSION"
               export SSL_DIR="$DRIVERS_TOOLS/.evergreen/x509gen"
+              export LIBMONGOC_VERSION="${LIBMONGOC_VERSION}"
            EOT
            # See what we've done
            cat expansion.yml
@@ -1142,15 +1144,15 @@ axes:
     display_name: libmongoc version
     values:
       - id: "lowest-supported"
-        display_name: "Lowest (1.18.0)"
+        display_name: "Lowest (1.19.1)"
         variables:
-          LIBMONGOC_VERSION: "1.18.0"
-      - id: "upccoming-stable"
-        display_name: "latest (1.18-dev)"
+          LIBMONGOC_VERSION: "1.19.1"
+      - id: "upcoming-stable"
+        display_name: "latest (1.19-dev)"
         variables:
-          LIBMONGOC_VERSION: "r1.18"
+          LIBMONGOC_VERSION: "r1.19"
       - id: "latest-dev"
-        display_name: "Upcoming release (1.19)"
+        display_name: "Upcoming release (1.20)"
         variables:
           LIBMONGOC_VERSION: "master"