Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
kentcdodds committed Mar 27, 2020
1 parent 4b8aa06 commit a0552ed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"react-dom": "16.13.1",
"react-error-boundary": "^1.2.5",
"react-icons": "^3.9.0",
"react-query": "^1.1.5",
"react-query": "^1.1.7",
"react-query-devtools": "^1.0.13",
"react-router": "^6.0.0-alpha.2",
"react-router-dom": "^6.0.0-alpha.2",
Expand Down
8 changes: 4 additions & 4 deletions scripts/update-exercises.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ if (branch === 'master' && username === 'kentcdodds') {
}

function updateExercises() {
console.log('Updating exercise branches')
console.log('▶️ Updating exercise branches')
const masterCommit = execSync('git rev-parse master')
const branches = execSync(
`git for-each-ref --format='%(refname:short)'`,
).split('\n')
const exerciseBranches = branches.filter(b => b.startsWith('exercises/'))
exerciseBranches.forEach(branch => {
const didUpdate = updateExerciseBranch(branch, masterCommit)
console.log(`${branch} is up to date.`)
console.log(` ✔️ ${branch} is up to date.`)
if (didUpdate) {
console.log(`Force pushing ${branch}`)
execSync('git push -f')
}
})
execSync('git checkout master')
console.log('All exercises up to date.')
console.log('All exercises up to date.')
}

function updateExerciseBranch(branch, masterCommit) {
Expand Down Expand Up @@ -66,7 +66,7 @@ function updateExerciseBranch(branch, masterCommit) {
status.includes('Unmerged')
) {
console.error(
'Merge conflict. Fix the conflict, then run the update-exercises script again to be sure you have everything up to date.',
'Merge conflict. Fix the conflict, then run the update-exercises script again to be sure you have everything up to date.',
)
throw status
}
Expand Down

0 comments on commit a0552ed

Please sign in to comment.