Skip to content

Commit

Permalink
chore: Switch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
eonarheim committed Sep 5, 2020
1 parent 855ce51 commit 2e98ae6
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 58 deletions.
10 changes: 8 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,41 @@ name: Bug Report
about: Something not working as expected? Tell us about it!
---

<!-- ::: IMPORTANT NOTE :::
<!-- ::: IMPORTANT NOTE :::
Hi, this is the Excalibur development team. Please take a moment to read the instructions below:
Please ask any questions you have in our forum: https://groups.google.com/forum/#!forum/excaliburjs
Please wait to file a Github issue until after you've read through and understand the contributing guidelines. If you're not sure if you should submit an issue, ask your question in the forum linked above.
https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#reporting-bugs
https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#reporting-bugs
-->

<!-- Please follow the format below to make it easier for us to help you -->
<!-- Add relevant pictures/gifs as appropriate -->

### Steps to Reproduce

<!-- Detailed steps for reproducing the problem -->
<!-- If possible, please include a self-contained code snippet that demonstrates the problem -->

### Expected Result

<!-- What you expected to happen -->

### Actual Result

<!-- What happened instead -->

### Environment

<!-- Please fill out these fields -->

- browsers and versions: <!-- e.x. Chrome (50.0.2883.87), Firefox (50.1.0), Edge (38.14393.0.0), etc. -->
- operating system: <!-- What OS are you using? -->
- Excalibur versions: <!-- which version(s) of Excalibur contain the bug?-->
- (anything else that may be relevant) <!-- Are there versions of Excalibur that don't contain the bug?, etc. -->

### Current Workaround

<!-- If you have determined a workaround for this issue, please detail it here -->
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Feature Request
about: Suggest a new feature or improvement
---

<!-- ::: IMPORTANT NOTE :::
<!-- ::: IMPORTANT NOTE :::
Hi, this is the Excalibur development team. Please take a moment to read the instructions below:
Please ask any questions you have in our forum: https://groups.google.com/forum/#!forum/excaliburjs
Please wait to file a Github issue until after you've read through and understand the contributing guidelines. If you're not sure if you should submit an issue, ask your question in the forum linked above.
https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#suggesting-improvements
https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#suggesting-improvements
-->

<!-- Please do a quick search through our [backlog][issues] to see if your improvement has already been suggested. If so, feel free to provide additional comments or thoughts on the existing issue. -->
Expand All @@ -19,8 +19,10 @@ https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#sug
<!-- Add relevant pictures/gifs as appropriate -->

### Context

<!-- Explain the background information for this request -->

### Proposal

<!-- Your idea for the new feature, improvement, etc. -->
<!-- If you have any ideas for implementation or next steps, add those here -->
10 changes: 5 additions & 5 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!--
Hi, and thanks for contributing to Excalibur!
Before you go any further, please read our contributing guide: https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md
Before you go any further, please read our contributing guide: https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md
especially the "Submitting Changes" section:
https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#submitting-changes
https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#submitting-changes
---
A quick summary checklist is included below for convenience:
-->
Expand All @@ -11,15 +11,15 @@ A quick summary checklist is included below for convenience:

- [ ] :pushpin: issue exists in github for these changes
- [ ] :microscope: existing tests still pass
- [ ] :see_no_evil: code conforms to the [style guide](https://github.com/excaliburjs/Excalibur/blob/master/STYLEGUIDE.md)
- [ ] :see_no_evil: code conforms to the [style guide](https://github.com/excaliburjs/Excalibur/blob/main/STYLEGUIDE.md)
- [ ] :triangular_ruler: new tests written and passing / old tests updated with new scenario(s)
- [ ] :page_facing_up: changelog entry added (or not needed)

==================

<!-- If you're closing an issue with this pull request, or contributing a significant change, please include your changes in the appropriate section of CHANGELOG.md as outlined in https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#creating-a-pull-request. -->
<!-- If you're closing an issue with this pull request, or contributing a significant change, please include your changes in the appropriate section of CHANGELOG.md as outlined in https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#creating-a-pull-request. -->

<!--Please format your pull request title according to our commit message styleguide: https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#commit-messages -->
<!--Please format your pull request title according to our commit message styleguide: https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#commit-messages -->

<!-- Thanks again! -->

Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ script:
- npm run travis
after_success:
- node deploy-docs.js
- if [[ "$TRAVIS_PULL_REQUEST" = "false" && ( "$TRAVIS_BRANCH" = "master" || "$TRAVIS_TAG" != "" ) ]]; then node_modules/.bin/grunt dists; fi
- if [[ "$TRAVIS_PULL_REQUEST" = "false" && ( "$TRAVIS_BRANCH" = "main" || "$TRAVIS_TAG" != "" ) ]]; then node_modules/.bin/grunt dists; fi
before_deploy:
- npm run build-storybook
deploy:
Expand All @@ -26,9 +26,9 @@ deploy:
github_token: $GH_TOKEN
local_dir: ./build-storybook
repo: excaliburjs/examples
target_branch: master
target_branch: main
on:
branch: master
branch: main
notifications:
slack:
secure: aQXFk2/MxX5eR2JM90xWAA9YX03QArY1ejUmnP/NkFHbB4zzKZblACjEeDTDTDCThZpXhrganX2nDWrWFrrXbOG28wKrRhEZSULPAgyiWGpfkMoT44fKmgh+eZ5C/isMF2eeQCrYo3EQCMxfCKxNaBhyLc+jr/Sm232zU2LaXo8=
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Added

- Option bag constructors have been added for commonly-used classes (see [Constructors.md](https://github.com/excaliburjs/Excalibur/blob/master/src/engine/Docs/Constructors.md)) ([#410](https://github.com/excaliburjs/Excalibur/issues/410))
- Option bag constructors have been added for commonly-used classes (see [Constructors.md](https://github.com/excaliburjs/Excalibur/blob/main/src/engine/Docs/Constructors.md)) ([#410](https://github.com/excaliburjs/Excalibur/issues/410))

<!----------------------------------------------------------------------------------------------->

Expand Down Expand Up @@ -728,7 +728,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- `Actor.addChild()` changed to `Actor.add()` ([#519](https://github.com/excaliburjs/Excalibur/issues/519))
- `Actor.removeChild()` changed to `Actor.remove()` ([#519](https://github.com/excaliburjs/Excalibur/issues/519))
- Documentation is only deployed on changes to the master git branch ([#483](https://github.com/excaliburjs/Excalibur/issues/483))
- Documentation is only deployed on changes to the main git branch ([#483](https://github.com/excaliburjs/Excalibur/issues/483))
- A warning message is now displayed if no supported audio format is provided for a browser ([#476](https://github.com/excaliburjs/Excalibur/issues/476))
- Updated TSLint directory scanning ([#442](https://github.com/excaliburjs/Excalibur/issues/442), [#443](https://github.com/excaliburjs/Excalibur/issues/443), [#447](https://github.com/excaliburjs/Excalibur/issues/447))
- Deprecated older methods ([#399](https://github.com/excaliburjs/Excalibur/issues/399))
Expand Down
4 changes: 2 additions & 2 deletions Excalibur.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<version>$version$</version>
<authors>Excalibur.js</authors>
<projectUrl>https://github.com/excaliburjs/Excalibur</projectUrl>
<licenseUrl>https://github.com/excaliburjs/Excalibur/master/blob/LICENSE.md</licenseUrl>
<iconUrl>https://raw.github.com/excaliburjs/Excalibur/master/assets/icon.png</iconUrl>
<licenseUrl>https://github.com/excaliburjs/Excalibur/main/blob/LICENSE.md</licenseUrl>
<iconUrl>https://raw.github.com/excaliburjs/Excalibur/main/assets/icon.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Excalibur.js is a simple JavaScript game engine with TypeScript bindings for making 2D games in HTML5 Canvas. Our mission is to make web game development as simple as possible.</description>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion GruntFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module.exports = function (grunt) {
// continuous integration dists
dist: {
options: {
branch: 'master',
branch: 'main',
remote: 'https://github.com/excaliburjs/excalibur-dist',
login: 'kamranayub',
token: process.env.GH_DIST_TOKEN,
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Logo](/assets/logo.png?raw=true)

[![Build Status](https://img.shields.io/travis/excaliburjs/Excalibur/master.svg)](https://travis-ci.org/excaliburjs/Excalibur)
[![Appveyor status](https://img.shields.io/appveyor/ci/eonarheim/excalibur/master.svg)](https://ci.appveyor.com/project/eonarheim/excalibur)
[![Build Status](https://img.shields.io/travis/excaliburjs/Excalibur/main.svg)](https://travis-ci.org/excaliburjs/Excalibur)
[![Appveyor status](https://img.shields.io/appveyor/ci/eonarheim/excalibur/main.svg)](https://ci.appveyor.com/project/eonarheim/excalibur)
[![Coverage Status](https://coveralls.io/repos/github/excaliburjs/Excalibur/badge.svg)](https://coveralls.io/github/excaliburjs/Excalibur)
[![npm version](https://img.shields.io/npm/v/excalibur.svg)](https://www.npmjs.com/package/excalibur)
[![npm downloads](https://img.shields.io/npm/dt/excalibur.svg)](https://www.npmjs.com/package/excalibur)
Expand Down Expand Up @@ -31,7 +31,7 @@ Visit the [API Reference](https://excaliburjs.com/docs/api/edge) section for ful
# Questions

- :question: Ask us anything in the [Excalibur.js forum](https://groups.google.com/forum/#!forum/excaliburjs)
- :bug: If you find a bug, report it on the [GitHub issues page](https://github.com/excaliburjs/Excalibur/issues) (please review our [guidelines for reporting bugs](https://github.com/excaliburjs/Excalibur/blob/master/.github/CONTRIBUTING.md#reporting-bugs)).
- :bug: If you find a bug, report it on the [GitHub issues page](https://github.com/excaliburjs/Excalibur/issues) (please review our [guidelines for reporting bugs](https://github.com/excaliburjs/Excalibur/blob/main/.github/CONTRIBUTING.md#reporting-bugs)).
- :mega: You can also follow us on Twitter [@excaliburjs](http://twitter.com/excaliburjs) or [read the blog](http://blog.excaliburjs.com).

# Samples
Expand Down
78 changes: 40 additions & 38 deletions deploy-docs.js
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
var Travis = require('travis-ci');
var repo = "excaliburjs/excaliburjs.github.io";
var repo = 'excaliburjs/excaliburjs.github.io';
var travis = new Travis({
version: '2.0.0',
headers: {
'User-Agent': 'Travis/1.0'
}
version: '2.0.0',
headers: {
'User-Agent': 'Travis/1.0'
}
});

var branch = process.env.TRAVIS_BRANCH;
var tag = process.env.TRAVIS_TAG;
var pr = process.env.TRAVIS_PULL_REQUEST;
var pr = process.env.TRAVIS_PULL_REQUEST;

if (pr !== "false") {
console.log("Skipping docs deployment, detected pull request");
return;
if (pr !== 'false') {
console.log('Skipping docs deployment, detected pull request');
return;
}

// build docs for tags and master only
// build docs for tags and main only
if (tag) {
console.log("Current tag is `" + tag + "`");
} else if (branch == "master") {
console.log("Current branch is `" + branch + "`");
console.log('Current tag is `' + tag + '`');
} else if (branch == 'main') {
console.log('Current branch is `' + branch + '`');
} else {
console.log("Current branch is `" + branch + "`, skipping docs deployment...");
return;
console.log('Current branch is `' + branch + '`, skipping docs deployment...');
return;
}

console.log("Triggering remote build of edge docs...");
console.log('Triggering remote build of edge docs...');

travis.authenticate({
github_token: process.env.GH_TOKEN
},
function (err, res) {
travis.authenticate(
{
github_token: process.env.GH_TOKEN
},
function (err, res) {
if (err) {
return console.error(err);
}

travis.repos(repo.split('/')[0], repo.split('/')[1]).builds.get(function (err, res) {
if (err) {
return console.error(err);
return console.error(err);
}

travis.repos(repo.split('/')[0], repo.split('/')[1]).builds.get(
function (err, res) {
if (err) {
return console.error(err);
}

travis.requests.post({
build_id: res.builds[0].id
}, function (err, res) {
if (err) {
return console.error(err);
}
console.log(res.flash[0].notice);
});
}
travis.requests.post(
{
build_id: res.builds[0].id
},
function (err, res) {
if (err) {
return console.error(err);
}
console.log(res.flash[0].notice);
}
);
}
);
});
}
);

0 comments on commit 2e98ae6

Please sign in to comment.