No more make-release-archive

Author: vector-of-bool

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

@@ -34,13 +34,6 @@ class FetchSource(Function):
         ),
         expansions_update(command_type=command_type,
                           file='mongoc/expansion.yml'),
-        bash_exec(
-            command_type=command_type,
-            script='''\
-                rm -f *.tar.gz
-                curl --retry 5 --output mongoc.tar.gz -sS --max-time 120 https://s3.amazonaws.com/mciuploads/${project}/${branch_name}/mongo-c-driver-${CURRENT_VERSION}.tar.gz
-            '''
-        ),
         # Scripts may not be executable on Windows.
         bash_exec(
             command_type=EvgCommandType.SETUP,

.evergreen/config_generator/components/make_release_archive.py

@@ -6,27 +6,20 @@
 from config_generator.etc.function import merge_defns
 from config_generator.etc.utils import bash_exec
 
-from config_generator.components.funcs.upload_build import UploadBuild
 
-
-class ReleaseArchive(Function):
-    name = 'release-archive'
+class MakeDocs(Function):
+    name = "make-docs"
     commands = [
         bash_exec(
             command_type=EvgCommandType.TEST,
-            working_dir='mongoc',
-            env={
-                'MONGOC_TEST_FUTURE_TIMEOUT_MS': '30000',
-                'MONGOC_TEST_SKIP_LIVE': 'on',
-                'MONGOC_TEST_SKIP_SLOW': 'on',
-            },
-            include_expansions_in_env=['distro_id'],
-            script='''\
+            working_dir="mongoc",
+            include_expansions_in_env=["distro_id"],
+            script="""\
                 set -o errexit
                 bash tools/poetry.sh install --with=docs
                 bash tools/poetry.sh run \
-                    bash .evergreen/scripts/check-release-archive.sh
-            '''
+                    bash .evergreen/scripts/build-docs.sh
+                """,
         ),
     ]
 
@@ -36,43 +29,43 @@ def call(cls, **kwargs):
 
 
 class UploadDocs(Function):
-    name = 'upload-docs'
+    name = "upload-docs"
     commands = [
         bash_exec(
-            working_dir='mongoc/cmake_build/src/libbson',
+            working_dir="mongoc/_build/for-docs/src/libbson",
             env={
-                'AWS_ACCESS_KEY_ID': '${aws_key}',
-                'AWS_SECRET_ACCESS_KEY': '${aws_secret}',
+                "AWS_ACCESS_KEY_ID": "${aws_key}",
+                "AWS_SECRET_ACCESS_KEY": "${aws_secret}",
             },
-            script='aws s3 cp doc/html s3://mciuploads/${project}/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1',
+            script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
         ),
         s3_put(
-            aws_key='${aws_key}',
-            aws_secret='${aws_secret}',
-            bucket='mciuploads',
-            content_type='text/html',
-            display_name='libbson docs',
-            local_file='mongoc/cmake_build/src/libbson/doc/html/index.html',
-            permissions='public-read',
-            remote_file='${project}/docs/libbson/${CURRENT_VERSION}/index.html',
+            aws_key="${aws_key}",
+            aws_secret="${aws_secret}",
+            bucket="mciuploads",
+            content_type="text/html",
+            display_name="libbson docs",
+            local_file="mongoc/_build/for-docs/src/libbson/doc/html/index.html",
+            permissions="public-read",
+            remote_file="${project}/docs/libbson/${CURRENT_VERSION}/index.html",
         ),
         bash_exec(
-            working_dir='mongoc/cmake_build/src/libmongoc',
+            working_dir="mongoc/_build/for-docs/src/libmongoc",
             env={
-                'AWS_ACCESS_KEY_ID': '${aws_key}',
-                'AWS_SECRET_ACCESS_KEY': '${aws_secret}',
+                "AWS_ACCESS_KEY_ID": "${aws_key}",
+                "AWS_SECRET_ACCESS_KEY": "${aws_secret}",
             },
-            script='aws s3 cp doc/html s3://mciuploads/${project}/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1'
+            script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1",
         ),
         s3_put(
-            aws_key='${aws_key}',
-            aws_secret='${aws_secret}',
-            bucket='mciuploads',
-            content_type='text/html',
-            display_name='libmongoc docs',
-            local_file='mongoc/cmake_build/src/libmongoc/doc/html/index.html',
-            permissions='public-read',
-            remote_file='${project}/docs/libmongoc/${CURRENT_VERSION}/index.html',
+            aws_key="${aws_key}",
+            aws_secret="${aws_secret}",
+            bucket="mciuploads",
+            content_type="text/html",
+            display_name="libmongoc docs",
+            local_file="mongoc/_build/for-docs/src/libmongoc/doc/html/index.html",
+            permissions="public-read",
+            remote_file="${project}/docs/libmongoc/${CURRENT_VERSION}/index.html",
         ),
     ]
 
@@ -82,68 +75,42 @@ def call(cls, **kwargs):
 
 
 class UploadManPages(Function):
-    name = 'upload-man-pages'
+    name = "upload-man-pages"
     commands = [
         bash_exec(
-            working_dir='mongoc',
+            working_dir="mongoc",
             silent=True,
-            script='''\
+            script="""\
                 set -o errexit
                 # Get "aha", the ANSI HTML Adapter.
                 git clone --depth 1 https://github.com/theZiz/aha.git aha-repo
                 pushd aha-repo
                 make
                 popd # aha-repo
                 mv aha-repo/aha .
-                .evergreen/scripts/man-pages-to-html.sh libbson cmake_build/src/libbson/doc/man > bson-man-pages.html
-                .evergreen/scripts/man-pages-to-html.sh libmongoc cmake_build/src/libmongoc/doc/man > mongoc-man-pages.html
-            '''
-        ),
-        s3_put(
-            aws_key='${aws_key}',
-            aws_secret='${aws_secret}',
-            bucket='mciuploads',
-            content_type='text/html',
-            display_name='libbson man pages',
-            local_file='mongoc/bson-man-pages.html',
-            permissions='public-read',
-            remote_file='${project}/man-pages/libbson/${CURRENT_VERSION}/index.html',
+                .evergreen/scripts/man-pages-to-html.sh libbson _build/for-docs/src/libbson/doc/man > bson-man-pages.html
+                .evergreen/scripts/man-pages-to-html.sh libmongoc _build/for-docs/src/libmongoc/doc/man > mongoc-man-pages.html
+                """,
         ),
         s3_put(
-            aws_key='${aws_key}',
-            aws_secret='${aws_secret}',
-            bucket='mciuploads',
-            content_type='text/html',
-            display_name='libmongoc man pages',
-            local_file='mongoc/mongoc-man-pages.html',
-            permissions='public-read',
-            remote_file='${project}/man-pages/libmongoc/${CURRENT_VERSION}/index.html',
-        ),
-    ]
-
-    @classmethod
-    def call(cls, **kwargs):
-        return cls.default_call(**kwargs)
-
-
-class UploadRelease(Function):
-    name = 'upload-release'
-    commands = [
-        bash_exec(
-            script='''\
-                if compgen -G "mongoc/cmake_build/mongo*gz" > /dev/null; then
-                    mv mongoc/cmake_build/mongo*gz mongoc.tar.gz
-                fi
-            '''
+            aws_key="${aws_key}",
+            aws_secret="${aws_secret}",
+            bucket="mciuploads",
+            content_type="text/html",
+            display_name="libbson man pages",
+            local_file="mongoc/bson-man-pages.html",
+            permissions="public-read",
+            remote_file="${project}/man-pages/libbson/${CURRENT_VERSION}/index.html",
         ),
         s3_put(
-            aws_key='${aws_key}',
-            aws_secret='${aws_secret}',
-            bucket='mciuploads',
-            content_type='${content_type|application/x-gzip}',
-            local_file='mongoc.tar.gz',
-            permissions='public-read',
-            remote_file='${project}/${branch_name}/mongo-c-driver-${CURRENT_VERSION}.tar.gz',
+            aws_key="${aws_key}",
+            aws_secret="${aws_secret}",
+            bucket="mciuploads",
+            content_type="text/html",
+            display_name="libmongoc man pages",
+            local_file="mongoc/mongoc-man-pages.html",
+            permissions="public-read",
+            remote_file="${project}/man-pages/libmongoc/${CURRENT_VERSION}/index.html",
         ),
     ]
 
@@ -154,23 +121,20 @@ def call(cls, **kwargs):
 
 def functions():
     return merge_defns(
-        ReleaseArchive.defn(),
+        MakeDocs.defn(),
         UploadDocs.defn(),
         UploadManPages.defn(),
-        UploadRelease.defn(),
     )
 
 
 def tasks():
     return [
         EvgTask(
-            name='make-release-archive',
+            name="make-docs",
             commands=[
-                ReleaseArchive.call(),
+                MakeDocs.call(),
                 UploadDocs.call(),
                 UploadManPages.call(),
-                UploadBuild.call(),
-                UploadRelease.call(),
             ],
         )
     ]

.evergreen/generated_configs/functions.yml

@@ -223,22 +223,27 @@ functions:
       type: setup
       params:
         binary: bash
+        working_dir: mongoc
         args:
           - -c
           - |
-            rm -f *.tar.gz
-            curl --retry 5 --output mongoc.tar.gz -sS --max-time 120 https://s3.amazonaws.com/mciuploads/${project}/${branch_name}/mongo-c-driver-${CURRENT_VERSION}.tar.gz
+            for file in $(find .evergreen/scripts -type f); do
+                chmod +rx "$file" || exit
+            done
+  make-docs:
     - command: subprocess.exec
-      type: setup
+      type: test
       params:
         binary: bash
         working_dir: mongoc
+        include_expansions_in_env:
+          - distro_id
         args:
           - -c
           - |
-            for file in $(find .evergreen/scripts -type f); do
-                chmod +rx "$file" || exit
-            done
+            set -o errexit
+            bash tools/poetry.sh install --with=docs
+            bash tools/poetry.sh run                     bash .evergreen/scripts/build-docs.sh
   openssl-static-compile:
     - command: subprocess.exec
       type: test
@@ -270,24 +275,6 @@ functions:
                     echo "Cannot append kerberos.realm to /etc/krb5.conf; skipping." 1>&2
                 fi
             fi
-  release-archive:
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        working_dir: mongoc
-        env:
-          MONGOC_TEST_FUTURE_TIMEOUT_MS: "30000"
-          MONGOC_TEST_SKIP_LIVE: "on"
-          MONGOC_TEST_SKIP_SLOW: "on"
-        include_expansions_in_env:
-          - distro_id
-        args:
-          - -c
-          - |
-            set -o errexit
-            bash tools/poetry.sh install --with=docs
-            bash tools/poetry.sh run                     bash .evergreen/scripts/check-release-archive.sh
   run-mock-kms-servers:
     - command: subprocess.exec
       type: setup
@@ -501,7 +488,7 @@ functions:
     - command: subprocess.exec
       params:
         binary: bash
-        working_dir: mongoc/cmake_build/src/libbson
+        working_dir: mongoc/_build/for-docs/src/libbson
         env:
           AWS_ACCESS_KEY_ID: ${aws_key}
           AWS_SECRET_ACCESS_KEY: ${aws_secret}
@@ -515,13 +502,13 @@ functions:
         aws_secret: ${aws_secret}
         bucket: mciuploads
         content_type: text/html
-        local_file: mongoc/cmake_build/src/libbson/doc/html/index.html
+        local_file: mongoc/_build/for-docs/src/libbson/doc/html/index.html
         permissions: public-read
         remote_file: ${project}/docs/libbson/${CURRENT_VERSION}/index.html
     - command: subprocess.exec
       params:
         binary: bash
-        working_dir: mongoc/cmake_build/src/libmongoc
+        working_dir: mongoc/_build/for-docs/src/libmongoc
         env:
           AWS_ACCESS_KEY_ID: ${aws_key}
           AWS_SECRET_ACCESS_KEY: ${aws_secret}
@@ -535,7 +522,7 @@ functions:
         aws_secret: ${aws_secret}
         bucket: mciuploads
         content_type: text/html
-        local_file: mongoc/cmake_build/src/libmongoc/doc/html/index.html
+        local_file: mongoc/_build/for-docs/src/libmongoc/doc/html/index.html
         permissions: public-read
         remote_file: ${project}/docs/libmongoc/${CURRENT_VERSION}/index.html
   upload-man-pages:
@@ -554,8 +541,8 @@ functions:
             make
             popd # aha-repo
             mv aha-repo/aha .
-            .evergreen/scripts/man-pages-to-html.sh libbson cmake_build/src/libbson/doc/man > bson-man-pages.html
-            .evergreen/scripts/man-pages-to-html.sh libmongoc cmake_build/src/libmongoc/doc/man > mongoc-man-pages.html
+            .evergreen/scripts/man-pages-to-html.sh libbson _build/for-docs/src/libbson/doc/man > bson-man-pages.html
+            .evergreen/scripts/man-pages-to-html.sh libmongoc _build/for-docs/src/libmongoc/doc/man > mongoc-man-pages.html
     - command: s3.put
       params:
         display_name: libbson man pages
@@ -657,25 +644,6 @@ functions:
         optional: true
         permissions: public-read
         remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log
-  upload-release:
-    - command: subprocess.exec
-      params:
-        binary: bash
-        args:
-          - -c
-          - |
-            if compgen -G "mongoc/cmake_build/mongo*gz" > /dev/null; then
-                mv mongoc/cmake_build/mongo*gz mongoc.tar.gz
-            fi
-    - command: s3.put
-      params:
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        bucket: mciuploads
-        content_type: ${content_type|application/x-gzip}
-        local_file: mongoc.tar.gz
-        permissions: public-read
-        remote_file: ${project}/${branch_name}/mongo-c-driver-${CURRENT_VERSION}.tar.gz
   upload-test-results:
     - command: subprocess.exec
       params: