tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: rename master -> main in CI and scripts (#246)

Browse Source 
Thanks for contributing to FOSS4G!
This commit is contained in:
Ian Saultz
2022-03-07 14:40:06 -05:00
committed by GitHub
parent e1cd6f829f
commit ea234edf67
28 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/environment.js
View File

@@ -24,7 +24,7 @@ if (pr) {
} else {
const head = process.env['CIRCLE_SHA1'];
for (const sha of execSync(`git rev-list --max-count=500 ${head}`).toString().trim().split('\n')) {
const base = execSync(`git branch -r --contains ${sha} origin/master origin/release-*`).toString().split('\n')[0].trim().replace(/^origin\//, '');
const base = execSync(`git branch -r --contains ${sha} origin/main origin/release-*`).toString().split('\n')[0].trim().replace(/^origin\//, '');
if (base) {
const mergeBase = execSync(`git merge-base origin/${base} ${head}`).toString().trim();
console.log(`export CIRCLE_TARGET_BRANCH=${base}`);

6
scripts/nitpick/submodule-pin.js
View File

@@ -6,8 +6,8 @@ const child_process = require('child_process');
const head = child_process.execSync('git -C maplibre-gl-js rev-parse HEAD').toString().trim();
const revs = child_process.execSync(`git -C maplibre-gl-js branch -a --contains ${head}`).toString().split('\n');
if (revs.indexOf(' remotes/origin/master') >= 0) {
nitpick.ok(`maplibre-gl-js submodule pin is merged to master`);
if (revs.indexOf(' remotes/origin/main') >= 0) {
nitpick.ok(`maplibre-gl-js submodule pin is merged to main`);
} else {
nitpick.fail(`maplibre-gl-js submodule is pinned to ${head}, which isn't merged to master`);
nitpick.fail(`maplibre-gl-js submodule is pinned to ${head}, which isn't merged to main`);
}

2
scripts/publish_binary_size.js
View File

@@ -56,7 +56,7 @@ function query(after) {
},
query: `query {
repository(owner: "mapbox", name: "mapbox-gl-native") {
ref(qualifiedName: "master") {
ref(qualifiedName: "main") {
target {
... on Commit {
history(first: 100, before: "36c6a8ea79bbd2596abb58ffb58debf65a4ea13d" ${after ? `, after: "${after}"` : ''}) {

2
scripts/publish_doxygen_coverage.js
View File

@@ -67,7 +67,7 @@ github.apps.createInstallationToken({installation_id: SIZE_CHECK_APP_INSTALLATIO
}
})];
if (process.env['CIRCLE_BRANCH'] === 'master') {
if (process.env['CIRCLE_BRANCH'] === 'main') {
promises.push(new AWS.S3({region: 'us-east-1'}).putObject({
Body: zlib.gzipSync(JSON.stringify({
'created_at': date,

2
scripts/update-boost.sh
View File

@@ -23,7 +23,7 @@ popd
echo "If everything works, run:"
echo ""
echo " git -C vendor/boost checkout master"
echo " git -C vendor/boost checkout main"
echo " git -C vendor/boost commit -m \"update boost to ${VERSION/_/.}\""
echo " git -C vendor/boost push"
echo " git add vendor/boost"