Skip to content

[CDRIVER-4640] Remove the Release Archive #1333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
45eb784
Define a mongo::detail::c_platform support library
vector-of-bool Jun 26, 2023
e03f6a4
Remove more usage of FindThreads
vector-of-bool Jun 27, 2023
414b568
Comman naming tweaks
vector-of-bool Jun 30, 2023
b62e6a4
Merge branch 'master' into platform-target
vector-of-bool Jun 30, 2023
c64c1da
Remove CMake code for source distribution
vector-of-bool Jun 23, 2023
f19cae6
Define a mongo::detail::c_platform support library
vector-of-bool Jun 26, 2023
f2be43a
"RELEASE" mode does not use release archive
vector-of-bool Jun 27, 2023
7f2b3ee
link-sample tasks do not use the source archive
vector-of-bool Jun 29, 2023
5a00f1d
More uses of release archive gone
vector-of-bool Jun 30, 2023
46265fe
No more make-release-archive
vector-of-bool Jun 30, 2023
6709f02
Rename make_release_archive -> make_docs
vector-of-bool Jun 30, 2023
be0222e
Rename the variant
vector-of-bool Jun 30, 2023
3f33078
Define a variant tag for protecting merges
vector-of-bool Jun 30, 2023
ffeb034
Tweaks from PR comments
vector-of-bool Jul 1, 2023
16058f8
Merge branch 'platform-target' into CDRIVER-4640-no-source-dist.3
vector-of-bool Jul 3, 2023
d6b34fe
Use stable Fedora for RPM build (for now)
vector-of-bool Jul 7, 2023
5a0112a
Use git archive to create the source archive
vector-of-bool Jul 7, 2023
a96c1ad
Additional PR cleanups and tweaks
vector-of-bool Jul 7, 2023
40545d1
Bring packaging tasks as PR-protected
vector-of-bool Jul 7, 2023
81b46af
Merge branch 'master' into CDRIVER-4640-no-source-dist.3
vector-of-bool Jul 7, 2023
847da56
Un-break zlib
vector-of-bool Jul 7, 2023
15e227a
Printing helps?
vector-of-bool Jul 11, 2023
02b93b3
Tweak pkg version detection
vector-of-bool Jul 11, 2023
133bd13
Tweak spec patchfile
vector-of-bool Jul 13, 2023
49c34a6
Better source filename detection
vector-of-bool Jul 13, 2023
0278889
Get source filename from rpmspec
vector-of-bool Jul 13, 2023
d75e48f
Tweak version detection v2
vector-of-bool Jul 13, 2023
4312086
Note pending removal of the release archive
vector-of-bool Jul 18, 2023
0eaf61a
Merge branch 'master' into CDRIVER-4640-no-source-dist.3
vector-of-bool Jul 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
139 changes: 139 additions & 0 deletions .evergreen/config_generator/components/make_docs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
from shrub.v3.evg_command import EvgCommandType
from shrub.v3.evg_command import s3_put
from shrub.v3.evg_task import EvgTask

from config_generator.etc.function import Function
from config_generator.etc.function import merge_defns
from config_generator.etc.utils import bash_exec


class MakeDocs(Function):
name = "make-docs"
commands = [
bash_exec(
command_type=EvgCommandType.TEST,
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/build-docs.sh
""",
),
]

@classmethod
def call(cls, **kwargs):
return cls.default_call(**kwargs)


class UploadDocs(Function):
name = "upload-docs"
commands = [
bash_exec(
working_dir="mongoc/_build/for-docs/src/libbson",
env={
"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",
),
s3_put(
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/_build/for-docs/src/libmongoc",
env={
"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",
),
s3_put(
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",
),
]

@classmethod
def call(cls, **kwargs):
return cls.default_call(**kwargs)


class UploadManPages(Function):
name = "upload-man-pages"
commands = [
bash_exec(
working_dir="mongoc",
silent=True,
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 _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="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="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)


def functions():
return merge_defns(
MakeDocs.defn(),
UploadDocs.defn(),
UploadManPages.defn(),
)


def tasks():
return [
EvgTask(
name="make-docs",
commands=[
MakeDocs.call(),
UploadDocs.call(),
UploadManPages.call(),
],
)
]
176 changes: 0 additions & 176 deletions .evergreen/config_generator/components/make_release_archive.py

This file was deleted.

24 changes: 12 additions & 12 deletions .evergreen/etc/spec.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
+--- mongo-c-driver.spec.orig 2023-07-17 14:42:52.236247070 -0400
++++ mongo-c-driver.spec 2023-07-17 14:43:16.572305452 -0400
--- mongo-c-driver.spec
+++ mongo-c-driver.spec
@@ -10,7 +10,7 @@
%global gh_project mongo-c-driver
%global libname libmongoc
Expand All @@ -14,23 +14,23 @@
Name: mongo-c-driver
Summary: Client library written in C for MongoDB
-Version: %{up_version}%{?up_prever:~%{up_prever}}
+Version: %{up_version}%{up_prever}
+Version: %{up_version}%{?up_prever}
Release: 1%{?dist}
# See THIRD_PARTY_NOTICES
License: Apache-2.0 AND ISC AND MIT AND Zlib
@@ -37,7 +37,6 @@
@@ -37,7 +37,6 @@ BuildRequires: openssl-devel
BuildRequires: pkgconfig(libsasl2)
BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(snappy)
-BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(libzstd)
%if %{with tests}
BuildRequires: mongodb-server
@@ -123,7 +122,6 @@
-DENABLE_SSL:STRING=OPENSSL \
-DENABLE_SASL:STRING=CYRUS \
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
- -DENABLE_ICU:STRING=ON \
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP:BOOL=OFF \
-DENABLE_CRYPTO_SYSTEM_PROFILE:BOOL=ON \
-DENABLE_MAN_PAGES:BOOL=ON \
@@ -123,7 +122,6 @@ Documentation: http://mongoc.org/libbson/%{version}/
-DENABLE_SSL:STRING=OPENSSL \
-DENABLE_SASL:STRING=CYRUS \
-DENABLE_MONGODB_AWS_AUTH:STRING=ON \
- -DENABLE_ICU:STRING=ON \
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP:BOOL=OFF \
-DENABLE_CRYPTO_SYSTEM_PROFILE:BOOL=ON \
-DENABLE_MAN_PAGES:BOOL=ON \
Loading