Skip to content

Commit a9bcdbb

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.32-releases
2 parents 94b7a44 + 1c456ad commit a9bcdbb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+998
-523
lines changed

.evergreen/functions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,11 @@ functions:
396396
set -e
397397
# Load environment variables
398398
eval $(.evergreen/print-compass-env.sh)
399-
rm -rf mongodb-csfle && mkdir -p mongodb-csfle
400-
(cd mongodb-csfle && \
401-
curl -sSfL $(npx -y mongodb-download-url --enterprise --csfle --version '>= 6.0.0-rc1') | \
399+
rm -rf mongodb-crypt && mkdir -p mongodb-crypt
400+
(cd mongodb-crypt && \
401+
curl -sSfL $(npx -y mongodb-download-url --enterprise --crypt_shared --version '>= 6.0.0-rc1') | \
402402
tar -xvz)
403-
export COMPASS_CSFLE_LIBRARY_PATH=$(echo $PWD/mongodb-csfle/lib/mongo_csfle_v1.*)
403+
export COMPASS_CRYPT_LIBRARY_PATH=$(echo $PWD/mongodb-crypt/lib/mongo_*_v1.*)
404404
npm run test-csfle --workspace mongodb-data-service
405405
406406
save-windows-artifacts:

.github/release.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- feature flagged
5+
categories:
6+
- title: New Features
7+
labels:
8+
- feat
9+
- title: Bug Fixes
10+
labels:
11+
- fix
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Release Notes are meant to be
2+
# displayed to users as part of the
3+
# auto-update process.
4+
#
5+
# The following workflow:
6+
# - removes the "by @username" and PR info
7+
# - removes the contributors section
8+
# - turn COMPASS-* and MONGOSH-* into links
9+
#
10+
name: Release Notes - Cleanup
11+
on:
12+
release:
13+
types: [published, edited]
14+
15+
jobs:
16+
cleanup_notes:
17+
name: Cleanup Notes
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Clean up notes
21+
run: |
22+
cat $GITHUB_EVENT_PATH | \
23+
jq -r .release.body | \
24+
sed 's/ by @.*//' | \
25+
grep -v 'New Contributors' | \
26+
grep -v '* @' | \
27+
grep -v '<!--' \
28+
> RELEASE_NOTES.md
29+
30+
- name: Update release
31+
env:
32+
RELEASE_TAG: ${{ github.event.release.tag_name }}
33+
GITHUB_REPO: ${{ github.repository }}
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35+
run: |
36+
gh release edit "${RELEASE_TAG}" \
37+
--repo "${GITHUB_REPO}" \
38+
--notes-file RELEASE_NOTES.md
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Prepare and validate a PR for auto-generated release notes:
2+
# - if the title starts with `feat` or `fix` adds the label (`feat`, `fix`) used
3+
# by the release notes to include the PR in the appropriate section.
4+
# - each PR that is a `feat` or `fix` must also include either a
5+
# `feature flagged` or `release notes` label, PRs that have the `feature flagged`
6+
# label will not be included in the release notes.
7+
#
8+
name: Release Notes - Labels
9+
on:
10+
pull_request:
11+
types: [opened, edited, labeled, unlabeled, synchronize]
12+
jobs:
13+
label:
14+
runs-on: ubuntu-latest
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
steps:
18+
- name: remove label
19+
uses: actions-ecosystem/action-remove-labels@v1
20+
with:
21+
labels: |
22+
fix
23+
feat
24+
25+
- name: add label based on title - fix
26+
if: |
27+
startsWith(github.event.pull_request.title, 'fix:') ||
28+
startsWith(github.event.pull_request.title, 'fix(')
29+
uses: actions-ecosystem/action-add-labels@v1
30+
with:
31+
labels: fix
32+
33+
- name: add label based on title - feat
34+
if: |
35+
startsWith(github.event.pull_request.title, 'feat:') ||
36+
startsWith(github.event.pull_request.title, 'feat(')
37+
uses: actions-ecosystem/action-add-labels@v1
38+
with:
39+
labels: feat
40+
41+
- uses: mheap/github-action-required-labels@v1
42+
with:
43+
mode: maximum
44+
count: 0
45+
labels: "wip, work in progress, work-in-progress"
46+
47+
- uses: mheap/github-action-required-labels@v1
48+
if: |
49+
startsWith(github.event.pull_request.title, 'fix:') ||
50+
startsWith(github.event.pull_request.title, 'fix(') ||
51+
startsWith(github.event.pull_request.title, 'feat:') ||
52+
startsWith(github.event.pull_request.title, 'feat(')
53+
with:
54+
mode: minimum
55+
count: 1
56+
labels: "feature flagged, release notes"

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ coverage
2727
.ackrc
2828
env-vars.sh
2929
mongocryptd.pid
30-
mongodb-csfle
30+
mongodb-crypt

0 commit comments

Comments
 (0)