You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/09/12 10:45:49 UTC
[2/2] incubator-griffin-site git commit: Initial commit
Initial commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/commit/80907ba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/tree/80907ba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/diff/80907ba6
Branch: refs/heads/master
Commit: 80907ba6f7755b34f7c1d25cb849182a788d4ae9
Parents: 4d1936c
Author: William Guo <gu...@apache.org>
Authored: Wed Sep 12 18:31:11 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Wed Sep 12 18:31:11 2018 +0800
----------------------------------------------------------------------
.idea/workspace.xml | 126 ++++++++++++++++++++++++++++++++++++-----------
deploy.sh | 20 ++++----
2 files changed, 108 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/80907ba6/.idea/workspace.xml
----------------------------------------------------------------------
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b8841b3..221b176 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,15 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d94082d4-dac0-42ea-b23d-72d2fa679fb2" name="Default" comment="">
- <change beforePath="$PROJECT_DIR$/_includes/head.html" beforeDir="false" afterPath="$PROJECT_DIR$/_includes/head.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/community.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/community.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/conf.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/conf.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/download.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/download.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/latest.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/latest.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/quick-start.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/quick-start.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/docs/usecases.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/docs/usecases.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/_site/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/_site/index.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/deploy.sh" beforeDir="false" afterPath="$PROJECT_DIR$/deploy.sh" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -28,24 +21,64 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="head.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/_includes/head.html">
+ <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
- <caret line="41" column="59" selection-start-line="41" selection-start-column="59" selection-end-line="41" selection-end-column="59" />
+ <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="index.html" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/index.html">
+ <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="FIRST">
+ <first_editor relative-caret-position="218">
+ <caret line="21" selection-start-line="21" selection-end-line="21" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="234">
- <caret line="17" column="54" selection-start-line="17" selection-start-column="54" selection-end-line="17" selection-end-column="54" />
+ <state relative-caret-position="100">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="quick-start.md" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/quick-start.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SECOND">
+ <first_editor relative-caret-position="120">
+ <caret line="6" column="39" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="deploy.sh" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/deploy.sh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="400">
+ <caret line="59" selection-start-line="59" selection-start-column="1" selection-end-line="68" selection-end-column="3" />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="_config.yml" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/_config.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-308" />
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -71,6 +104,9 @@
<list>
<option value="$PROJECT_DIR$/_includes/head.html" />
<option value="$PROJECT_DIR$/index.html" />
+ <option value="$PROJECT_DIR$/.gitignore" />
+ <option value="$PROJECT_DIR$/quick-start.md" />
+ <option value="$PROJECT_DIR$/deploy.sh" />
</list>
</option>
</component>
@@ -101,16 +137,6 @@
<item name="incubator-griffin-site" type="b2602c69:ProjectViewProjectNode" />
<item name="incubator-griffin-site" type="462c0819:PsiDirectoryNode" />
</path>
- <path>
- <item name="incubator-griffin-site" type="b2602c69:ProjectViewProjectNode" />
- <item name="incubator-griffin-site" type="462c0819:PsiDirectoryNode" />
- <item name="_includes" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="incubator-griffin-site" type="b2602c69:ProjectViewProjectNode" />
- <item name="incubator-griffin-site" type="462c0819:PsiDirectoryNode" />
- <item name="images" type="462c0819:PsiDirectoryNode" />
- </path>
</expand>
<select />
</subPane>
@@ -126,6 +152,11 @@
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="MavenSettings" />
</component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$/images" />
+ </key>
+ </component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
@@ -206,12 +237,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1536745717840</updated>
- <workItem from="1536745719218" duration="182000" />
+ <workItem from="1536745719218" duration="1480000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="182000" />
+ <option name="totallyTimeSpent" value="1480000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="803" extended-state="0" />
@@ -267,6 +298,45 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/README.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="FIRST">
+ <first_editor relative-caret-position="218">
+ <caret line="21" selection-start-line="21" selection-end-line="21" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/_config.yml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-308" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/.gitignore">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="100">
+ <caret line="5" selection-start-line="5" selection-end-line="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/quick-start.md">
+ <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+ <state split_layout="SECOND">
+ <first_editor relative-caret-position="120">
+ <caret line="6" column="39" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
+ </first_editor>
+ <second_editor />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/deploy.sh">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="400">
+ <caret line="59" selection-start-line="59" selection-start-column="1" selection-end-line="68" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
</component>
<component name="masterDetails">
<states>
http://git-wip-us.apache.org/repos/asf/incubator-griffin-site/blob/80907ba6/deploy.sh
----------------------------------------------------------------------
diff --git a/deploy.sh b/deploy.sh
index f580192..af784c1 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -57,14 +57,14 @@ else
echo "Push $SITE failed"
fi
-# Switch back to SOURCE branch
-git checkout $SOURCE > /dev/null 2>&1
-
-# Push the SOURCE to the server
-git push -u origin $SOURCE > /dev/null 2>&1
-if [ $? = 0 ]; then
- echo "Push $SOURCE successful"
-else
- echo "Push $SOURCE failed"
-fi
+## Switch back to SOURCE branch
+#git checkout $SOURCE > /dev/null 2>&1
+#
+## Push the SOURCE to the server
+#git push -u origin $SOURCE > /dev/null 2>&1
+#if [ $? = 0 ]; then
+# echo "Push $SOURCE successful"
+#else
+# echo "Push $SOURCE failed"
+#fi