Skip to content

Commit c26e80f

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents ac94592 + b9e43a4 commit c26e80f

File tree

97 files changed

+2579
-2078
lines changed

Some content is hidden

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

97 files changed

+2579
-2078
lines changed

.evergreen/functions.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,11 @@ functions:
560560
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
561561
npm config list
562562
echo "Publishing packages as $(npm whoami)"
563-
git update-index --assume-unchanged .npmrc
563+
npm run version-packages-next
564+
# unstage after lerna staged version
565+
git reset
566+
# mark files as unchanged so that lerna can publish
567+
git update-index --assume-unchanged $(git diff --name-only HEAD)
564568
bash ".evergreen/retry-with-backoff.sh" npm run publish-packages-next
565569
fi
566570

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Tue Sep 05 2023.
2+
This document was automatically generated on Fri Sep 08 2023.
33

44
## List of dependencies
55

package-lock.json

Lines changed: 45 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
"where": "monorepo-where",
4444
"create-workspace": "node ./scripts/create-workspace.js",
4545
"update-evergreen-config": "node .evergreen/template-yml.js",
46-
"publish-packages-next": "npx lerna publish from-package \"0.0.0-next-$(git rev-parse HEAD)\" --force-publish --exact --no-git-tag-version --no-private --dist-tag next --pre-dist-tag next --no-verify-access --no-git-reset --yes",
46+
"version-packages-next": "npx lerna version \"0.0.0-next-$(git rev-parse HEAD)\" --exact --no-private --no-git-tag-version --force-publish --no-push --yes",
47+
"publish-packages-next": "npx lerna publish from-package --no-private --dist-tag next --pre-dist-tag next --yes",
4748
"prepare": "husky install",
4849
"snyk-test": "node scripts/snyk-test.js",
4950
"pregenerate-vulnerability-report": "npm run compile -w packages/compass && npm run snyk-test",

0 commit comments

Comments
 (0)