Skip to content

Commit

Permalink
chore(ci): fix package publish next COMPASS-6860 (#4817)
Browse files Browse the repository at this point in the history
* chore: make sure all plugins are published

* chore: split version-next and package-next so we can run them separately and retry publish

* chore(compass-aggregations): fix types
  • Loading branch information
gribnoysup authored Sep 7, 2023
1 parent b7d0093 commit b7fec80
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 18 deletions.
6 changes: 5 additions & 1 deletion .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,11 @@ functions:
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
npm config list
echo "Publishing packages as $(npm whoami)"
git update-index --assume-unchanged .npmrc
npm run version-packages-next
# unstage after lerna staged version
git reset
# mark files as unchanged so that lerna can publish
git update-index --assume-unchanged $(git diff --name-only HEAD)
bash ".evergreen/retry-with-backoff.sh" npm run publish-packages-next
fi
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
"where": "monorepo-where",
"create-workspace": "node ./scripts/create-workspace.js",
"update-evergreen-config": "node .evergreen/template-yml.js",
"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",
"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",
"publish-packages-next": "npx lerna publish from-package --no-private --dist-tag next --pre-dist-tag next --yes",
"prepare": "husky install",
"snyk-test": "node scripts/snyk-test.js",
"pregenerate-vulnerability-report": "npm run compile -w packages/compass && npm run snyk-test",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,10 @@ export default class PipelineParser {
}

function getLineOnlySourceLocation(line: number) {
return { start: { line, column: 0 }, end: { line, column: 0 } };
return {
start: { line, column: 0 },
end: { line, column: 0 },
} as t.SourceLocation;
}

function adjustStageLoc(stage: t.Node, line: number) {
Expand Down
6 changes: 4 additions & 2 deletions packages/compass-app-stores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"name": "MongoDB Inc",
"email": "[email protected]"
},
"private": true,
"bugs": {
"url": "https://jira.mongodb.org/projects/COMPASS/issues",
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "0.5.2",
"version": "7.0.0",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand Down Expand Up @@ -81,5 +80,8 @@
},
"peerDependencies": {
"mongodb-instance-model": "^12.9.2"
},
"publishConfig": {
"access": "public"
}
}
2 changes: 1 addition & 1 deletion packages/compass-explain-plan/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"react": "^17.0.2"
},
"devDependencies": {
"@mongodb-js/compass-field-store": "^0.3.1",
"@mongodb-js/compass-field-store": "^9.0.0",
"@mongodb-js/eslint-config-compass": "^1.0.8",
"@mongodb-js/mocha-config-compass": "^1.3.0",
"@mongodb-js/prettier-config-compass": "^1.0.1",
Expand Down
6 changes: 4 additions & 2 deletions packages/compass-field-store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"name": "MongoDB Inc",
"email": "[email protected]"
},
"private": true,
"bugs": {
"url": "https://jira.mongodb.org/projects/COMPASS/issues",
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "0.3.1",
"version": "9.0.0",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand Down Expand Up @@ -77,5 +76,8 @@
"reflux-state-mixin": "github:mongodb-js/reflux-state-mixin",
"sinon": "^9.2.3",
"xvfb-maybe": "^0.2.1"
},
"publishConfig": {
"access": "public"
}
}
4 changes: 2 additions & 2 deletions packages/compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,14 @@
"@electron/remote": "^2.0.11",
"@mongodb-js/atlas-service": "^0.3.0",
"@mongodb-js/compass-aggregations": "^9.13.0",
"@mongodb-js/compass-app-stores": "^0.5.2",
"@mongodb-js/compass-app-stores": "^7.0.0",
"@mongodb-js/compass-collection": "^4.12.0",
"@mongodb-js/compass-crud": "^13.12.0",
"@mongodb-js/compass-database": "^3.12.0",
"@mongodb-js/compass-databases-collections": "^1.12.0",
"@mongodb-js/compass-explain-plan": "^6.12.0",
"@mongodb-js/compass-export-to-language": "^8.12.0",
"@mongodb-js/compass-field-store": "^0.3.1",
"@mongodb-js/compass-field-store": "^9.0.0",
"@mongodb-js/compass-find-in-page": "^4.12.0",
"@mongodb-js/compass-home": "^6.13.0",
"@mongodb-js/compass-import-export": "^7.12.0",
Expand Down

0 comments on commit b7fec80

Please sign in to comment.