Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,33 @@ jobs:
run: |
# Whatever changes occured at that point, they are irrelevant
git reset HEAD --hard

# Remove verdaccio storage. Should not be there, but just in case
rm -rf ./storage
verdaccio --config ./scripts/monorepo/verdaccio.yaml --listen 4873 &
VERDACCIO_PID=$!
npx wait-on -t 3000 http://localhost:4873

# Publish packages and update private packages post publish. We have
# to manually run our update script as we can't use git-tag-version in
# CI environment (so version lifecycle is not triggered) and lerna
# doesn't bump private packages on canary publish because reasons
# (see https://github.com/lerna/lerna/issues/2206#issuecomment-521421420)
npx lerna publish prerelease \
--preid pr \
--canary \
--no-private \
--no-push \
--no-git-tag-version \
--no-git-reset \
--force-publish "*" \
--yes
npm run version -- --no-stage --no-package-lock

# Setting debug before this line breaks plugins build process
export DEBUG=hadron*,mongo*,electron*
npm run release-evergreen

# Clean-up background verdaccio process
kill $VERDACCIO_PID
shell: bash

Expand Down
3 changes: 3 additions & 0 deletions packages/compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@
"**/node_modules/bindings/**",
"**/file-uri-to-path/**"
]
},
"rebuild": {
"onlyModules": ["interruptor", "keytar", "kerberos"]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess eventually we want mongodb-client-encryption to be a part of this list so it can be used in Compass shell, but for now this doesn't change any current behavior

}
}
},
Expand Down
1 change: 1 addition & 0 deletions packages/hadron-build/commands/release.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ const installDependencies = (CONFIG, done) => {
cli.debug('Dependencies installed');

rebuild({
...CONFIG.rebuild,
electronVersion: CONFIG.packagerOptions.electronVersion,
buildPath: path.join(CONFIG.resources, 'app'),
force: true
Expand Down
10 changes: 7 additions & 3 deletions scripts/bump-private-dependencies.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ const NO_STAGE = process.argv.includes('--no-stage');

const NO_COMMIT = process.argv.includes('--no-commit');

const NO_PACKAGE_LOCK = process.argv.includes('--no-package-lock');

async function main() {
const packages = JSON.parse(
(await runInDir(`${LERNA_BIN} list --all --json --toposort`)).stdout
Expand Down Expand Up @@ -55,9 +57,11 @@ async function main() {
);
}

await withProgress('Updating package-lock at root', async () => {
await runInDir('npm install --package-lock-only');
});
if (!NO_PACKAGE_LOCK) {
await withProgress('Updating package-lock at root', async () => {
await runInDir('npm install --package-lock-only');
});
}

if (!NO_STAGE) {
await withProgress('Staging changes for commit', async () => {
Expand Down