Pārlūkot izejas kodu

Merge branch 'release/0.1.0-beta.3'

Sebastian Haas 9 gadi atpakaļ
vecāks
revīzija
442f422a54
6 mainītis faili ar 20 papildinājumiem un 10 dzēšanām
  1. 4 0
      .gitignore
  2. 9 3
      .travis.yml
  3. 6 1
      CHANGELOG.md
  4. BIN
      bin/gh_pages_deploy_key.enc
  5. 0 5
      bin/publish_gh_page.sh
  6. 1 1
      package.json

+ 4 - 0
.gitignore

@@ -56,3 +56,7 @@ typings
 .idea/encodings.xml
 *.md
 node_modules/
+
+# Private key for GH pages deploy
+bin/gh_pages_deploy_key
+bin/gh_pages_deploy_key.pub

+ 9 - 3
.travis.yml

@@ -15,7 +15,13 @@ deploy:
   on:
     tags: true
     branch: master
-    repo: opensheetmusicdisplay/opensheetmusicdisplay 
+    repo: opensheetmusicdisplay/opensheetmusicdisplay
 after_deploy:
-  - chmod +x ./bin/publish_gh_page.sh
-  - ./bin/publish_gh_page.sh
+- eval "$(ssh-agent -s)"
+- chmod 600 bin/gh_pages_deploy_key
+- ssh-add bin/gh_pages_deploy_key  
+- chmod +x ./bin/publish_gh_page.sh
+- ./bin/publish_gh_page.sh
+before_install:
+- openssl aes-256-cbc -K $encrypted_170846311824_key -iv $encrypted_170846311824_iv
+  -in bin/gh_pages_deploy_key.enc -out bin/gh_pages_deploy_key -d

+ 6 - 1
CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 ### Bugfixes
 
+## [0.1.0-beta.3] - 2016-09-21
+### Changed
+- Updated Github pages deployment ([64a332c](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/64a332c9f75fa60fb74e5f3b9dabb291ed7062e6))
+
 ## [0.1.0-beta.2] - 2016-09-21
 ### Changed
 - Updated Github pages deploy script ([4ac4dbb](https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/commit/4ac4dbbebf578db0eddfbaa64f90091a32e915fb))
@@ -67,7 +71,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - First public pre-release
 
-[Unreleased]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.2...HEAD
+[Unreleased]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.3...HEAD
+[0.1.0-beta.3]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.2...0.1.0-beta.3
 [0.1.0-beta.2]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta.1...0.1.0-beta.2
 [0.1.0-beta.1]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.1.0-beta...0.1.0-beta.1
 [0.1.0-beta]: https://github.com/opensheetmusicdisplay/opensheetmusicdisplay/compare/0.0.1-alpha.1...0.1.0-beta

BIN
bin/gh_pages_deploy_key.enc


+ 0 - 5
bin/publish_gh_page.sh

@@ -1,10 +1,5 @@
 #!/bin/bash
 
-# Add Github deploy key for opensheetmusicdisplay/opensheetmusicdisplay.github.io.git
-echo $GH_PAGES_DEPLOY_KEY > privatedeploykey
-chmod 400 ./privatedeploykey
-ssh-add ./privatedeploykey
-
 # Prepare files to be published
 grunt docs
 grunt build:demo

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "opensheetmusicdisplay",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.3",
   "description": "An open source JavaScript engine for displaying MusicXML based on VexFlow.",
   "main": "dist/src/OSMD/OSMD.js",
   "typings": "dist/src/OSMD/OSMD",