You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by an...@apache.org on 2015/11/11 19:17:10 UTC
incubator-apex-site git commit: add syntax highlighting,
fix code indent issue
Repository: incubator-apex-site
Updated Branches:
refs/heads/master e7d42e3c8 -> 974db8187
add syntax highlighting, fix code indent issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/974db818
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/974db818
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/974db818
Branch: refs/heads/master
Commit: 974db81872d8c83a88c1d179aefa195eeaf52416
Parents: e7d42e3
Author: Andy Perlitch <an...@datatorrent.com>
Authored: Wed Nov 11 10:14:49 2015 -0800
Committer: Andy Perlitch <an...@datatorrent.com>
Committed: Wed Nov 11 10:14:49 2015 -0800
----------------------------------------------------------------------
gulpfile.js | 7 ++++++-
package.json | 3 ++-
src/less/body.less | 4 ++++
src/less/main.less | 3 ++-
src/md/release.md | 20 ++++++++++++++------
5 files changed, 28 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/974db818/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index cd10344..3a3c47b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -14,7 +14,12 @@ var BUILD_LOCATION = './content';
// Converts files in src/md into html files in .tmp/partials
gulp.task('md2html', function() {
return gulp.src('./src/md/*.md')
- .pipe(marked())
+ .pipe(marked({
+ breaks: true,
+ highlight: function (code) {
+ return require('highlight.js').highlightAuto(code).value;
+ }
+ }))
.pipe(gulp.dest(TEMP_PARTIAL_LOCATION))
.on('error', function(err) {
console.warn(err);
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/974db818/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 896b3c7..26da00f 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"gulp-compile-handlebars": "^0.5.0",
"gulp-less": "^3.0.3",
"gulp-marked": "^1.0.0",
- "handlebars": "^4.0.2"
+ "handlebars": "^4.0.2",
+ "highlight.js": "^8.9.1"
}
}
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/974db818/src/less/body.less
----------------------------------------------------------------------
diff --git a/src/less/body.less b/src/less/body.less
index 35e8bac..b24e555 100644
--- a/src/less/body.less
+++ b/src/less/body.less
@@ -1,3 +1,7 @@
body {
-webkit-font-smoothing: antialiased;
+}
+
+pre code {
+ white-space: pre-line;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/974db818/src/less/main.less
----------------------------------------------------------------------
diff --git a/src/less/main.less b/src/less/main.less
index b610e8a..2f76a21 100644
--- a/src/less/main.less
+++ b/src/less/main.less
@@ -3,4 +3,5 @@
@import "./header.less";
@import "./footer.less";
@import "./index.less";
-@import "./body.less";
\ No newline at end of file
+@import "./body.less";
+@import (inline) "../../node_modules/highlight.js/styles/color-brewer.css";
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/974db818/src/md/release.md
----------------------------------------------------------------------
diff --git a/src/md/release.md b/src/md/release.md
index 89f2219..bb8c556 100644
--- a/src/md/release.md
+++ b/src/md/release.md
@@ -7,7 +7,8 @@ http://www.apache.org/dev/release.html
## Creating Release Branch
If this is a minor release (X.Y.0), start with creating a new branch. Example for 3.2.0:
-```
+
+```bash
git checkout devel-3 && git pull
git checkout -b release-3.2 devel-3
```
@@ -21,7 +22,7 @@ For informational purpose, this should yield the list of files that needs the ve
https://malhar.atlassian.net/browse/APEX-34
For -core:
-```
+```bash
dv=3.2.0-incubating-SNAPSHOT
rv=3.3.0-incubating-SNAPSHOT
for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done
@@ -117,6 +118,7 @@ Prerequisites:
- Tag pushed to ASF git
Build and deploy release candidate from RC tag:
+
```
git checkout "v${rv}-RC1"
git clean -d -f
@@ -127,17 +129,23 @@ Log on to https://repository.apache.org and look for Staging Repositories. "Clos
Example URL: https://repository.apache.org/content/repositories/orgapacheapex-1000/
Copy files to distribution dir and create checksums
+
```bash
md5sum apex-3.2.0-incubating-source-release.tar.gz > apex-3.2.0-incubating-source-release.tar.gz.md5
md5sum apex-3.2.0-incubating-source-release.zip > apex-3.2.0-incubating-source-release.zip.md5
shasum -a 512 apex-3.2.0-incubating-source-release.tar.gz > apex-3.2.0-incubating-source-release.tar.gz.sha
shasum -a 512 apex-3.2.0-incubating-source-release.zip > apex-3.2.0-incubating-source-release.zip.sha
-```
+
svn co https://dist.apache.org/repos/dist/dev/incubator/apex
+```
+
create directory for new version
svn add the source archives and signature/checksum files
+
+```bash
svn commit -m "Apache Apex v3.2.0-incubating-RC2"
+```
## Voting
@@ -171,19 +179,19 @@ Create version numbers for next release
### git
Create final release tag:
-```
+```bash
git tag -a "v3.2.0-incubating" -m "Release 3.2.0-incubating" "v3.2.0-incubating-RC2"
git push apache "v3.2.0-incubating"
```
Bump patch version number in release branch (X.Y.Z+1 - otherwise same as when creating new release branch):
-```
+```bash
git checkout release-3.2
dv=3.2.0-incubating-SNAPSHOT
rv=3.2.1-incubating-SNAPSHOT
for a in `git grep -l "${dv}"`; do echo $a; sed -i 's/'"${dv}"'/'"${rv}"'/g' $a; done
git commit -am "Preparing for 3.2.1 development"
```
-Merge @since tag and change log changes to devel-3
+Merge `@since` tag and change log changes to `devel-3`
## Announce Release