You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by ga...@apache.org on 2019/10/29 17:16:47 UTC
[parquet-site] branch asf-site updated: PARQUET-1675: Switch to git
for website
This is an automated email from the ASF dual-hosted git repository.
gabor pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/parquet-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new c33295d PARQUET-1675: Switch to git for website
c33295d is described below
commit c33295dd637ca06936d92356b48dc3dd358593a1
Author: Gabor Szadovszky <ga...@cloudera.com>
AuthorDate: Tue Oct 29 17:31:59 2019 +0100
PARQUET-1675: Switch to git for website
gitpubsub only supports the directories "content" and "output" so
moving the content to "output" from "publish"
Add the simpliest configuration to .asf.yaml to have a similar
setup than we had in svn. (It means that we generate the static content
manually.)
Update the documentation about the site update.
---
.asf.yaml | 4 ++++
config.rb | 4 ++--
{publish => output}/adopters/index.html | 0
{publish => output}/assets/css/bootstrap-theme.css | 0
.../assets/css/bootstrap-theme.css.map | 0
.../assets/css/bootstrap-theme.min.css | 0
{publish => output}/assets/css/bootstrap.css | 0
{publish => output}/assets/css/bootstrap.css.map | 0
{publish => output}/assets/css/bootstrap.min.css | 0
{publish => output}/assets/css/font-awesome.css | 0
{publish => output}/assets/css/font-awesome.min.css | 0
{publish => output}/assets/fonts/FontAwesome.otf | Bin
.../assets/fonts/fontawesome-webfont.eot | Bin
.../assets/fonts/fontawesome-webfont.svg | 0
.../assets/fonts/fontawesome-webfont.ttf | Bin
.../assets/fonts/fontawesome-webfont.woff | Bin
.../assets/fonts/glyphicons-halflings-regular.eot | Bin
.../assets/fonts/glyphicons-halflings-regular.svg | 0
.../assets/fonts/glyphicons-halflings-regular.ttf | Bin
.../assets/fonts/glyphicons-halflings-regular.woff | Bin
.../assets/img/apache_incubator_logo.png | Bin
{publish => output}/assets/img/favicon.ico | Bin
{publish => output}/assets/img/parquet_logo.png | Bin
{publish => output}/assets/js/bootstrap.js | 0
{publish => output}/assets/js/bootstrap.min.js | 0
{publish => output}/assets/js/jquery-2.1.1.min.js | 0
{publish => output}/bylaws/index.html | 0
{publish => output}/community/index.html | 0
{publish => output}/contribute/index.html | 19 ++++++++++++-------
{publish => output}/developers/index.html | 0
{publish => output}/doap_Parquet.rdf | 0
.../documentation/how-to-release/index.html | 0
{publish => output}/documentation/latest/index.html | 0
{publish => output}/downloads/index.html | 0
{publish => output}/index.html | 0
{publish => output}/presentations/index.html | 0
source/config.rb | 4 ++--
source/contribute.html.md | 19 ++++++++++++-------
38 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000..ade2c74
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,4 @@
+staging: false
+
+publish:
+ whoami: asf-site
diff --git a/config.rb b/config.rb
index c1be3ec..72fa0a7 100644
--- a/config.rb
+++ b/config.rb
@@ -33,7 +33,7 @@ set :markdown, :layout_engine => :erb,
:fenced_code_blocks => true,
:with_toc_data => true
-set :build_dir, 'publish'
+set :build_dir, 'output'
set :css_dir, 'assets/css'
set :js_dir, 'assets/js'
@@ -46,4 +46,4 @@ end
activate :directory_indexes
activate :syntax
-activate :livereload
\ No newline at end of file
+activate :livereload
diff --git a/publish/adopters/index.html b/output/adopters/index.html
similarity index 100%
rename from publish/adopters/index.html
rename to output/adopters/index.html
diff --git a/publish/assets/css/bootstrap-theme.css b/output/assets/css/bootstrap-theme.css
similarity index 100%
rename from publish/assets/css/bootstrap-theme.css
rename to output/assets/css/bootstrap-theme.css
diff --git a/publish/assets/css/bootstrap-theme.css.map b/output/assets/css/bootstrap-theme.css.map
similarity index 100%
rename from publish/assets/css/bootstrap-theme.css.map
rename to output/assets/css/bootstrap-theme.css.map
diff --git a/publish/assets/css/bootstrap-theme.min.css b/output/assets/css/bootstrap-theme.min.css
similarity index 100%
rename from publish/assets/css/bootstrap-theme.min.css
rename to output/assets/css/bootstrap-theme.min.css
diff --git a/publish/assets/css/bootstrap.css b/output/assets/css/bootstrap.css
similarity index 100%
rename from publish/assets/css/bootstrap.css
rename to output/assets/css/bootstrap.css
diff --git a/publish/assets/css/bootstrap.css.map b/output/assets/css/bootstrap.css.map
similarity index 100%
rename from publish/assets/css/bootstrap.css.map
rename to output/assets/css/bootstrap.css.map
diff --git a/publish/assets/css/bootstrap.min.css b/output/assets/css/bootstrap.min.css
similarity index 100%
rename from publish/assets/css/bootstrap.min.css
rename to output/assets/css/bootstrap.min.css
diff --git a/publish/assets/css/font-awesome.css b/output/assets/css/font-awesome.css
similarity index 100%
rename from publish/assets/css/font-awesome.css
rename to output/assets/css/font-awesome.css
diff --git a/publish/assets/css/font-awesome.min.css b/output/assets/css/font-awesome.min.css
similarity index 100%
rename from publish/assets/css/font-awesome.min.css
rename to output/assets/css/font-awesome.min.css
diff --git a/publish/assets/fonts/FontAwesome.otf b/output/assets/fonts/FontAwesome.otf
similarity index 100%
rename from publish/assets/fonts/FontAwesome.otf
rename to output/assets/fonts/FontAwesome.otf
diff --git a/publish/assets/fonts/fontawesome-webfont.eot b/output/assets/fonts/fontawesome-webfont.eot
similarity index 100%
rename from publish/assets/fonts/fontawesome-webfont.eot
rename to output/assets/fonts/fontawesome-webfont.eot
diff --git a/publish/assets/fonts/fontawesome-webfont.svg b/output/assets/fonts/fontawesome-webfont.svg
similarity index 100%
rename from publish/assets/fonts/fontawesome-webfont.svg
rename to output/assets/fonts/fontawesome-webfont.svg
diff --git a/publish/assets/fonts/fontawesome-webfont.ttf b/output/assets/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from publish/assets/fonts/fontawesome-webfont.ttf
rename to output/assets/fonts/fontawesome-webfont.ttf
diff --git a/publish/assets/fonts/fontawesome-webfont.woff b/output/assets/fonts/fontawesome-webfont.woff
similarity index 100%
rename from publish/assets/fonts/fontawesome-webfont.woff
rename to output/assets/fonts/fontawesome-webfont.woff
diff --git a/publish/assets/fonts/glyphicons-halflings-regular.eot b/output/assets/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from publish/assets/fonts/glyphicons-halflings-regular.eot
rename to output/assets/fonts/glyphicons-halflings-regular.eot
diff --git a/publish/assets/fonts/glyphicons-halflings-regular.svg b/output/assets/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from publish/assets/fonts/glyphicons-halflings-regular.svg
rename to output/assets/fonts/glyphicons-halflings-regular.svg
diff --git a/publish/assets/fonts/glyphicons-halflings-regular.ttf b/output/assets/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from publish/assets/fonts/glyphicons-halflings-regular.ttf
rename to output/assets/fonts/glyphicons-halflings-regular.ttf
diff --git a/publish/assets/fonts/glyphicons-halflings-regular.woff b/output/assets/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from publish/assets/fonts/glyphicons-halflings-regular.woff
rename to output/assets/fonts/glyphicons-halflings-regular.woff
diff --git a/publish/assets/img/apache_incubator_logo.png b/output/assets/img/apache_incubator_logo.png
similarity index 100%
rename from publish/assets/img/apache_incubator_logo.png
rename to output/assets/img/apache_incubator_logo.png
diff --git a/publish/assets/img/favicon.ico b/output/assets/img/favicon.ico
similarity index 100%
rename from publish/assets/img/favicon.ico
rename to output/assets/img/favicon.ico
diff --git a/publish/assets/img/parquet_logo.png b/output/assets/img/parquet_logo.png
similarity index 100%
rename from publish/assets/img/parquet_logo.png
rename to output/assets/img/parquet_logo.png
diff --git a/publish/assets/js/bootstrap.js b/output/assets/js/bootstrap.js
similarity index 100%
rename from publish/assets/js/bootstrap.js
rename to output/assets/js/bootstrap.js
diff --git a/publish/assets/js/bootstrap.min.js b/output/assets/js/bootstrap.min.js
similarity index 100%
rename from publish/assets/js/bootstrap.min.js
rename to output/assets/js/bootstrap.min.js
diff --git a/publish/assets/js/jquery-2.1.1.min.js b/output/assets/js/jquery-2.1.1.min.js
similarity index 100%
rename from publish/assets/js/jquery-2.1.1.min.js
rename to output/assets/js/jquery-2.1.1.min.js
diff --git a/publish/bylaws/index.html b/output/bylaws/index.html
similarity index 100%
rename from publish/bylaws/index.html
rename to output/bylaws/index.html
diff --git a/publish/community/index.html b/output/community/index.html
similarity index 100%
rename from publish/community/index.html
rename to output/community/index.html
diff --git a/publish/contribute/index.html b/output/contribute/index.html
similarity index 95%
rename from publish/contribute/index.html
rename to output/contribute/index.html
index 4e1dcf9..f58be5b 100644
--- a/publish/contribute/index.html
+++ b/output/contribute/index.html
@@ -213,10 +213,10 @@ ruby environment setup</p>
<div class="highlight"><pre class="highlight plaintext"><code>gem install bundler
bundle install
</code></pre></div>
-<h3 id="checking-out-the-website">Checking out the website</h3>
+<h3 id="cloning-the-website">Cloning the website</h3>
-<p>Checkout the website from SVN:</p>
-<div class="highlight"><pre class="highlight plaintext"><code>svn co https://svn.apache.org/repos/asf/parquet
+<p>Cloning the website from git:</p>
+<div class="highlight"><pre class="highlight plaintext"><code>git clone https://github.com/apache/parquet-site
</code></pre></div>
<h3 id="make-changes-in-source">Make changes in source/</h3>
@@ -228,9 +228,14 @@ vim contribute.html.md
<p>To generate the static wesbite for Apache Parquet run the following commands at the root site directory:</p>
<div class="highlight"><pre class="highlight plaintext"><code>bundle exec middleman build
-svn add *
-svn commit -m 'made changes to the site'
+git add .
+git commit -m 'made changes to the site'
+git push
</code></pre></div>
+<p>(git push can only be done by a committer. If you are not a committer then you
+may create a pull reqest from your forked repository and let a committer push
+your changes.)</p>
+
<h3 id="live-development">Live Development</h3>
<p>Live development of the site enables automatic reload when changes are saved.
@@ -240,8 +245,8 @@ To enable run the following command and then open a browser and navigate to
</code></pre></div>
<h3 id="publishing-the-site">Publishing the Site</h3>
-<p>The website uses svnpubsub. The publish folder contains the websites content
-and when committed to the svn repository it will be automatically deployed to
+<p>The website uses gitpubsub. The output folder contains the websites content
+and when committed to the git repository it will be automatically deployed to
the live site. </p>
</div>
diff --git a/publish/developers/index.html b/output/developers/index.html
similarity index 100%
rename from publish/developers/index.html
rename to output/developers/index.html
diff --git a/publish/doap_Parquet.rdf b/output/doap_Parquet.rdf
similarity index 100%
rename from publish/doap_Parquet.rdf
rename to output/doap_Parquet.rdf
diff --git a/publish/documentation/how-to-release/index.html b/output/documentation/how-to-release/index.html
similarity index 100%
rename from publish/documentation/how-to-release/index.html
rename to output/documentation/how-to-release/index.html
diff --git a/publish/documentation/latest/index.html b/output/documentation/latest/index.html
similarity index 100%
rename from publish/documentation/latest/index.html
rename to output/documentation/latest/index.html
diff --git a/publish/downloads/index.html b/output/downloads/index.html
similarity index 100%
rename from publish/downloads/index.html
rename to output/downloads/index.html
diff --git a/publish/index.html b/output/index.html
similarity index 100%
rename from publish/index.html
rename to output/index.html
diff --git a/publish/presentations/index.html b/output/presentations/index.html
similarity index 100%
rename from publish/presentations/index.html
rename to output/presentations/index.html
diff --git a/source/config.rb b/source/config.rb
index c1be3ec..72fa0a7 100644
--- a/source/config.rb
+++ b/source/config.rb
@@ -33,7 +33,7 @@ set :markdown, :layout_engine => :erb,
:fenced_code_blocks => true,
:with_toc_data => true
-set :build_dir, 'publish'
+set :build_dir, 'output'
set :css_dir, 'assets/css'
set :js_dir, 'assets/js'
@@ -46,4 +46,4 @@ end
activate :directory_indexes
activate :syntax
-activate :livereload
\ No newline at end of file
+activate :livereload
diff --git a/source/contribute.html.md b/source/contribute.html.md
index a707e30..a9ac5ac 100644
--- a/source/contribute.html.md
+++ b/source/contribute.html.md
@@ -88,10 +88,10 @@ ruby environment setup
gem install bundler
bundle install
-### Checking out the website
-Checkout the website from SVN:
+### Cloning the website
+Cloning the website from git:
- svn co https://svn.apache.org/repos/asf/parquet
+ git clone https://github.com/apache/parquet-site
### Make changes in source/
Make any changes in the source directory:
@@ -103,8 +103,13 @@ Make any changes in the source directory:
To generate the static wesbite for Apache Parquet run the following commands at the root site directory:
bundle exec middleman build
- svn add *
- svn commit -m 'made changes to the site'
+ git add .
+ git commit -m 'made changes to the site'
+ git push
+
+(git push can only be done by a committer. If you are not a committer then you
+may create a pull reqest from your forked repository and let a committer push
+your changes.)
### Live Development
Live development of the site enables automatic reload when changes are saved.
@@ -114,7 +119,7 @@ To enable run the following command and then open a browser and navigate to
bundle exec middleman
### Publishing the Site
-The website uses svnpubsub. The publish folder contains the websites content
-and when committed to the svn repository it will be automatically deployed to
+The website uses gitpubsub. The output folder contains the websites content
+and when committed to the git repository it will be automatically deployed to
the live site.