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.

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

chore: fix generate-docs.js to use 'main' instead of 'master' #1168

Merged
merged 3 commits into from Jun 28, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/__helpers__/can-i-skip-tests.js
Expand Up @@ -2,7 +2,7 @@
var whitelist = process.argv.slice(2)
var { execSync } = require('child_process')

var result = execSync('git diff master --name-only', { encoding: 'utf8' })
var result = execSync('git diff main --name-only', { encoding: 'utf8' })

var files = result.trim().split('\n')

Expand Down
2 changes: 1 addition & 1 deletion __tests__/__helpers__/generate-docs.js
Expand Up @@ -291,7 +291,7 @@ console.log('done')
(function rewriteEditLink() {
const el = document.querySelector('a.edit-page-link.button');
if (el) {
el.href = 'https://github.com/isomorphic-git/isomorphic-git/edit/master/src/api/${obj.name}.js';
el.href = 'https://github.com/isomorphic-git/isomorphic-git/edit/main/src/api/${obj.name}.js';
}
})();
</script>`
Expand Down
2 changes: 1 addition & 1 deletion __tests__/__helpers__/karma-translate-browser.js
Expand Up @@ -7,7 +7,7 @@ module.exports = function translateBrowser(fullname) {
} else if (fullname.startsWith('Mobile Safari')) {
return 'sl_ios_safari'
} else if (fullname.startsWith('Chrome Mobile')) {
return 'sl_android_chrome'
return 'bs_android_chrome'
} else if (fullname.startsWith('Safari')) {
return 'sl_safari'
} else if (fullname.startsWith('Chrome')) {
Expand Down
2 changes: 1 addition & 1 deletion __tests__/__helpers__/set-TRAVIS_PULL_REQUEST_SHA.js
Expand Up @@ -4,7 +4,7 @@ if (!process.env.TRAVIS_PULL_REQUEST_SHA) {
// I'm trying not to rely on isomorphic-git here since that's the thing being tested.
const log = execSync('git log --pretty=%P -n 1', { encoding: 'utf8' })
const parents = log.split(' ').map(x => x.trim())
// parents[0] === master branch
// parents[0] === main branch
// parents[1] === pr branch
process.env.TRAVIS_PULL_REQUEST_SHA = parents[1]
}
2 changes: 1 addition & 1 deletion karma.conf.js
Expand Up @@ -79,7 +79,7 @@ module.exports = function(config) {
base: 'SauceLabs',
browserName: 'safari',
platform: 'macOS 10.15',
version: '13.0',
version: '13.1',
},
sl_ios_safari: {
base: 'SauceLabs',
Expand Down