diff --git a/.travis.yml b/.travis.yml index 277f41550..81d62a30f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,14 @@ language: node_js node_js: - - '5' +- '5' sudo: false +env: + global: + - secure: kPOwvkCDLpwJneCPeKUxbEZSsPWPpOpIK2wKf5Fm2BqJlUm+Wm8g5GZy1WHjo/IdNyb5mDIJzxWcr/uYDykehkNR1tRVrzUfRCVWqOFXGeI5P9e0zBaXp/GW3kfKivWNhpec8WSu9ZPjQhsRfDCjKRCHAB3JzwDWF8Kfl9UeBicFXQVRo+9zo3okRLsuJsEP/0MEtN0GxdsfKDleSW28AZLxu7raoJHHFY1t3QxMoYDd5312Pz7smv1/l4RG/P6XZZrtWEeVwctrNbU0CBO8tX8nqUCHA0bWyOW+crf4/NZZGg9e1RUq8eDbVUd7iGq81nr0+F7IvvwbvSLmpU2/b9hbcF4i4MpIE1Yy/0+zUhuTj1Yy8tw/irc8Y6Nc/g25BJBSCrfdPQnnbAESUv2ywbHC8vBztLca1xBQbQ+q0N0YYUK/mgxUiOznwTQ3PRIs/SENSdhFufT9pCRBp+lvkY+DVHSt6ogPYdRmyF/KPdcDWu5GqKrUs4KyroAzMLX/brw9+TjASnjTipnUWSlTQpoXjf1aQQuescqZMAbxEZH5ed6YvyPehdDqB8bpkeZ9OUkP8pV1kndSnnUsDH7Kn7ZyYUI20FNsU8Yqp1v94jOfrz2np2N9mJUT3teDy8k4yIxTERYSfbBcn4X30YX8fwRk/8skHRtgU4VOpUnIjkw= script: - - npm install - - npm test +- cp travis-auto-deploy.sh ~/travis-auto-deploy.sh +- sh ~/travis-auto-deploy.sh branches: only: - - master - - /^\d+\.\d+/ -deploy: - provider: npm - email: manager@mathjax.org - api_key: - secure: q7e4haV9hAHng28w6EBnOc6ptorxjxeATW6ZocYiPk68To3IUHMt615rzyotfA5TBCcPJyeUJiqNcuUXbh+r8HmER4bJsjaGMpETPSkdvzQ1bYg2EJEvT6V/xc+sRGoj5ri/F2uH99AYnF99IugjeWvjpp5F5z370fJIMiUmXX8= - on: - tags: true + - v2.6-racket-mini-source + - v2.7.1-racket-mini-source diff --git a/Gruntfile.js b/Gruntfile.js index 9b1c220e8..30a2fe4a1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -252,11 +252,32 @@ module.exports = function(grunt) { "unpacked/config/Accessible-full.js", "config/Accessible.js", "unpacked/config/Accessible.js", - "config/default.js", - "unpacked/config/default.js", + //"config/default.js", + //"unpacked/config/default.js", "config/Safe.js", "unpacked/config/Safe.js" ], + fullConfig: [ + "config/*-full.js" + ], + restConfig: [ + "config/AM_CHTML.js", + "config/AM_HTMLorMML.js", + "config/AM_SVG.js", + //"config/default.js", + "config/MML_CHTML.js", + "config/MML_HTMLorMML.js", + "config/MMLorHTML.js", + "config/MML_SVG.js", + "config/TeX-AMS_CHTML.js", + "config/TeX-AMS_HTML.js", + "config/TeX-AMS-MML_HTMLorMML.js", + "config/TeX-AMS-MML_SVG.js", + "config/TeX-AMS_SVG.js", + "config/TeX-MML-AM_CHTML.js", + "config/TeX-MML-AM_HTMLorMML.js", + "config/TeX-MML-AM_SVG.js" + ], a11yExtensions: [ "extensions/AssistiveMML.js", "unpacked/extensions/AssistiveMML.js" @@ -285,7 +306,7 @@ module.exports = function(grunt) { "images" // these are used in the menu. Removing them will give you 404 errors but nothing will break. ], notcode: [ - ".gitignore", + //".gitignore", "docs", "test", "CONTRIBUTING.md", @@ -294,13 +315,15 @@ module.exports = function(grunt) { "bower.json", "composer.json", ".npmignore", - "package.json" + "package.json", + ".travis.yml" ] }, "regex-replace": { // disable image fonts in default HTML-CSS config noImageFont: { - src: ['unpacked/jax/output/HTML-CSS/config.js'], + src: ['unpacked/jax/output/HTML-CSS/config.js', + 'config/default.js'], actions: [ { name: 'nullImageFont', @@ -342,6 +365,7 @@ module.exports = function(grunt) { "clean:eot", "clean:otf", "clean:png", + "regex-replace:noImageFont", "clean:svg", "clean:woff", // Input. Pick at least one. @@ -364,11 +388,11 @@ module.exports = function(grunt) { "clean:images", "clean:notcode" ]); - grunt.registerTask("MML_SVG_TeX", [ + grunt.registerTask("racket-mini", [ // Early choices. "clean:unpacked", // "clean:packed", // pick one -- packed for production, unpacked for development. - "clean:allConfigs", // if you do not need any combined configuration files. + //"clean:allConfigs", // if you do not need any combined configuration files. // Fonts. Pick at least one! Check notes above on configurations. "clean:fontAsana", "clean:fontGyrePagella", @@ -376,33 +400,35 @@ module.exports = function(grunt) { "clean:fontLatinModern", "clean:fontNeoEuler", "clean:fontStix", - "clean:fontStixWeb", + //"clean:fontStixWeb", // "clean:fontTeX", // Font formats. Pick at least one (unless you use SVG output; then clean all). - "clean:dropFonts", // when using SVG output + //"clean:dropFonts", // when using SVG output "clean:eot", "clean:otf", "clean:png", - "clean:svg", - "clean:woff", + //"clean:svg", + //"clean:woff", // Input. Pick at least one. - "clean:asciimathInput", - // "clean:mathmlInput", - "clean:texInput", + //"clean:asciimathInput", + //"clean:mathmlInput", + //"clean:texInput", // Output - "clean:htmlCssOutput", - "clean:mathmlOutput", + //"clean:htmlCssOutput", + //"clean:mathmlOutput", // "clean:svgOutput", // Extensions. You probably want to leave the set matching your choices. - "clean:extensionsAsciimath", - // "clean:extensionsMathml", - "clean:extensionsTeX", - "clean:extensionHtmlCss", + //"clean:extensionsAsciimath", + //"clean:extensionsMathml", + //"clean:extensionsTeX", + //"clean:extensionHtmlCss", // Other items - "clean:locales", + // "clean:locales", "clean:miscConfig", + "clean:fullConfig", + "clean:restConfig", // "clean:miscExtensions", // you probably want that - "clean:images", + //"clean:images", "clean:notcode" ]); grunt.registerTask("mjNode", [ diff --git a/config/default.js b/config/default.js index fc54590c0..16a19af8f 100644 --- a/config/default.js +++ b/config/default.js @@ -101,7 +101,7 @@ MathJax.Hub.Config({ // jax array above, and "asciimath2jax.js" if you using "input/AsciiMath". // Include "jsmath2jax.js" if you are converting from using jsMath to MathJax. // - extensions: ["tex2jax.js"], + extensions: ["tex2jax.js","TeX/AMSmath.js","TeX/AMSsymbols.js"], // // Patterns to remove from before and after math script tags. If you are not diff --git a/travis-auto-deploy.sh b/travis-auto-deploy.sh new file mode 100644 index 000000000..a600d3dc4 --- /dev/null +++ b/travis-auto-deploy.sh @@ -0,0 +1,49 @@ +#!/bin/sh +set -e +set +x +if test "$(git config remote.origin.url)" != "https://github.com/jsmaniac/scribble-mathjax.git"; then + echo "Not on official repo, will not deploy gh-pages." +elif test "$TRAVIS_PULL_REQUEST" != "false"; then + echo "This is a Pull Request, will not deploy gh-pages." +elif test "$TRAVIS_BRANCH" != "v2.6-racket-mini-source"; then + echo "Not on v2.6-racket-mini-source branch (TRAVIS_BRANCH = $TRAVIS_BRANCH), will not deploy gh-pages." +elif test -z "${encrypted_675a73236f08_key:-}" -o -z "${encrypted_675a73236f08_iv:-}"; then + echo "Travis CI secure environment variables are unavailable, will not deploy gh-pages." +else + set -x + echo "Automatic push to gh-pages" + ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true + + # Git configuration: + git config --global user.name "$(git log --format="%aN" HEAD -1) (Travis CI automatic commit)" + git config --global user.email "$(git log --format="%aE" HEAD -1)" + + # SSH configuration + mkdir -p ~/.ssh + chmod 700 ~/.ssh + set +x + if openssl aes-256-cbc -K $encrypted_675a73236f08_key -iv $encrypted_675a73236f08_iv -in travis-deploy-key-id_rsa.enc -out travis-deploy-key-id_rsa -d >/dev/null 2>&1; then + echo "Dectypred key successfully." + else + echo "Error while decrypting key." + fi + mv travis-deploy-key-id_rsa ~/.ssh/travis-deploy-key-id_rsa + set -x + chmod 600 ~/.ssh/travis-deploy-key-id_rsa + set +x + eval `ssh-agent -s` + set -x + ssh-add ~/.ssh/travis-deploy-key-id_rsa + + + npm install grunt grunt-cli grunt-contrib-clean grunt-regex-replace + PATH="$PWD/node_modules/grunt-cli/bin:$PATH" grunt racket-mini + git add -A . >/dev/null 2>&1 + git rm -f .gitignore || true + git rm -f Gruntfile.js || true + git rm -f travis-deploy-key-id_rsa.enc || true + git rm -f travis-auto-deploy.sh || true + git commit -m "auto-commit" >/dev/null 2>&1 + git log --oneline --decorate --graph -10 + git push --force --quiet "git@github.com:jsmaniac/scribble-mathjax.git" HEAD:refs/heads/v2.6-racket-mini > /dev/null 2>&1 +fi \ No newline at end of file diff --git a/travis-deploy-key-id_rsa.enc b/travis-deploy-key-id_rsa.enc new file mode 100644 index 000000000..db7b4e3d1 Binary files /dev/null and b/travis-deploy-key-id_rsa.enc differ