Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: fix internal dependencies not bumped in main package.json #1736

Merged
merged 1 commit into from
Oct 16, 2024
Merged

chore: fix internal dependencies not bumped in main package.json #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"version": "10.3.0",
"npmClient": "npm",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
}
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"@emotion/react": "^11.13.3",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.11.1",
"@instructure/browserslist-config-instui": "10.3.0",
"@instructure/pkg-utils": "10.3.0",
"@instructure/browserslist-config-instui": "workspace:*",
"@instructure/pkg-utils": "workspace:*",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/react": "^16.0.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/ui-scripts/lib/utils/git.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,14 @@ export const isReleaseCommit = (version) => {
}
}

/**
* Checks whether the folder has any changes with `git status`.
* If there are any the process exits with an error code
*/
export function checkWorkingDirectory() {
let result
try {
// --porcelain outputs in a machine-readable format
result = runGitCommand(['status', '--porcelain'])
} catch (e) {
error(e)
Expand Down
12 changes: 6 additions & 6 deletions packages/ui-scripts/lib/utils/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ export async function bumpPackages(packageName, requestedVersion) {
await runCommandAsync('lerna', [
'version',
...args,
'--exact',
'--include-merged-tags',
'--no-push',
'--no-git-tag-version',
'--force-publish=*',
'--conventional-commits'
'--exact', // exact versions, no ^ when bumping
'--include-merged-tags', // Include tags from merged branches
'--no-push', // do not execute `git push`
'--no-git-tag-version', // do not add git tag or commit
'--force-publish=*', // bump all packages even if they have no changes
'--conventional-commits' // determines new version and updates Changelog
])

releaseVersion = await syncRootPackageVersion(true)
Expand Down
Loading