[CDRIVER-5932] Simplify version calculations

.evergreen/config_generator/components/funcs/fetch_source.py

@@ -18,14 +18,7 @@ class FetchSource(Function):
                 set -o errexit
                 set -o pipefail
                 if [ -n "${github_pr_number}" -o "${is_patch}" = "true" ]; then
-                    # This is a GitHub PR or patch build, probably branched from master
-                    if command -v python3 &>/dev/null; then
-                        # Prefer python3 if it is available
-                        echo $(python3 ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
-                    else
-                        echo $(python ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
-                    fi
-                    VERSION=$VERSION_CURRENT-${version_id}
+                    VERSION=patch-${version_id}
                 else
                     VERSION=latest
                 fi

.evergreen/generated_configs/functions.yml

@@ -216,14 +216,7 @@ functions:
             set -o errexit
             set -o pipefail
             if [ -n "${github_pr_number}" -o "${is_patch}" = "true" ]; then
-                # This is a GitHub PR or patch build, probably branched from master
-                if command -v python3 &>/dev/null; then
-                    # Prefer python3 if it is available
-                    echo $(python3 ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
-                else
-                    echo $(python ./build/calc_release_version.py --next-minor) > VERSION_CURRENT
-                fi
-                VERSION=$VERSION_CURRENT-${version_id}
+                VERSION=patch-${version_id}
             else
                 VERSION=latest
             fi

.evergreen/scripts/abi-compliance-check.sh

@@ -8,12 +8,15 @@ mkdir abi-compliance/changes-install
 mkdir abi-compliance/latest-release-install
 mkdir abi-compliance/dumps
 
-python ./build/calc_release_version.py --next-minor >VERSION_CURRENT
-python ./build/calc_release_version.py --next-minor -p >VERSION_RELEASED
+declare head_commit today
+# The 10 digits of the current commit
+head_commit=$(git rev-parse --revs-only --short=10 "HEAD^{commit}")
+# The YYYYMMDD date
+today=$(date +%Y%m%d)
 
 declare newest current
-newest="$(cat VERSION_RELEASED)"
-current="$(cat VERSION_CURRENT)"
+current="$(cat VERSION_CURRENT)-$today+git$head_commit"
+newest=$(cat etc/prior_version.txt)
 
 declare working_dir
 working_dir="$(pwd)"

.evergreen/scripts/build-docs.sh

@@ -9,10 +9,6 @@ CMAKE=$(find_cmake_latest)
 # Check that a CLion user didn't accidentally convert NEWS from UTF-8 to ASCII
 grep "á" NEWS > /dev/null || (echo "NEWS file appears to have lost its UTF-8 encoding?" || exit 1)
 
-debug "Calculating release version..."
-python build/calc_release_version.py >VERSION_CURRENT
-python build/calc_release_version.py -p >VERSION_RELEASED
-
 build_dir=$MONGOC_DIR/_build/for-docs
 "$CMAKE" -S "$MONGOC_DIR" -B "$build_dir" \
   -D ENABLE_MAN_PAGES=ON \

.evergreen/scripts/build_snapshot_rpm.sh

@@ -84,11 +84,7 @@ sudo mock -r ${config} --use-bootstrap-image --isolation=simple --install rpmdev
 sudo mock -r ${config} --use-bootstrap-image --isolation=simple --dnf-cmd --setopt=powertools.module_hotfixes=true install utf8proc-devel
 
 sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyin "$(pwd)" "$(pwd)/${spec_file}" /tmp
-sudo mock -r ${config} --use-bootstrap-image --isolation=simple --cwd "/tmp/${build_dir}" --chroot -- /bin/sh -c "(
-  python3.11 build/calc_release_version.py | sed -E 's/([^-]+).*/\1/' > VERSION_CURRENT ;
-  python3.11 build/calc_release_version.py -p > VERSION_RELEASED
-  )"
-sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" "/tmp/${build_dir}/VERSION_RELEASED" .
+sudo mock -r ${config} --use-bootstrap-image --isolation=simple --copyout "/tmp/${build_dir}/VERSION_CURRENT" .
 
 bare_upstream_version=$(rpmspec --srpm -q --qf '%{version}' "$spec_file")
 # Upstream version in the .spec file cannot have hyphen (-); replace the current

.gitignore

@@ -20,7 +20,6 @@ CTestTestfile.cmake
 _build/
 dist_manifest.txt
 test-results.json
-VERSION_RELEASED
 *.pyc
 
 # Windows things

CMakeLists.txt

@@ -16,7 +16,6 @@ include (ParseVersion)
 ParseVersion ("${BUILD_VERSION}" MONGOC)
 # Defines additional similar variables:
 include (LoadVersion)
-file (WRITE VERSION_CURRENT "${BUILD_VERSION}")
 LoadVersion (VERSION_CURRENT MONGOC)
 
 # Extended version attributes that CMake doesn't (yet) understand, which include

Earthfile

@@ -26,15 +26,15 @@ build:
     LET source_dir=/opt/mongoc/source
     LET build_dir=/opt/mongoc/build
     COPY --dir \
-        src/ \
         build/ \
-        COPYING \
         CMakeLists.txt \
+        COPYING \
+        NEWS \
         README.rst \
+        src/ \
         THIRD_PARTY_NOTICES \
-        NEWS \
+        VERSION_CURRENT \
         "$source_dir"
-    COPY +version-current/ $source_dir
     ENV CCACHE_HOME=/root/.cache/ccache
     RUN cmake -S "$source_dir" -B "$build_dir" -G "Ninja Multi-Config" \
         -D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
@@ -115,20 +115,6 @@ test-cxx-driver:
     ENV CCACHE_BASE=$source
     RUN --mount=type=cache,target=$CCACHE_HOME cmake --build $build
 
-# version-current :
-#   Create the VERSION_CURRENT file using Git. This file is exported as an artifact at /
-version-current:
-    # Run on Alpine, which does this work the fastest
-    FROM alpine:3.18
-    # Install Python and Git, the only things required for this job:
-    RUN apk add git python3
-    # Copy only the .git/ directory and calc_release_version, which are enough to get the VERSION_CURRENT
-    COPY --dir .git/ build/calc_release_version.py /s/
-    # Calculate it:
-    RUN cd /s/ && \
-        python calc_release_version.py --next-minor > VERSION_CURRENT
-    SAVE ARTIFACT /s/VERSION_CURRENT
-
 # PREP_CMAKE "warms up" the CMake installation cache for the current environment
 PREP_CMAKE:
     COMMAND