Skip to content

Commit e55cc8e

Browse files
nealrichardsonpitroufsaintjacquesgregswinehartlidavidm
authored
ARROW-9335: [Website] Update website for 1.0 (apache#63)
Co-authored-by: Antoine Pitrou <[email protected]> Co-authored-by: François Saint-Jacques <[email protected]> Co-authored-by: Greg <[email protected]> Co-authored-by: David Li <[email protected]> Co-authored-by: Ryan Murray <[email protected]> Co-authored-by: Sutou Kouhei <[email protected]> Co-authored-by: Wes McKinney <[email protected]> Co-authored-by: Andy Grove <[email protected]>
1 parent 269fcf1 commit e55cc8e

28 files changed

+1493
-539
lines changed

‎.github/workflows/deploy.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Configure for production
3737
run: |
3838
echo "BASE_URL=" >> ../env.sh
39-
echo "ORIGIN=$(jq --raw-output .repository.full_name ${GITHUB_EVENT_PATH})" >> ../env.sh
39+
echo "ORIGIN=${{ github.repository }}" >> ../env.sh
4040
echo "TARGET_BRANCH=asf-site" >> ../env.sh
4141
echo >> _extra_config.yml
4242
if: |
@@ -45,7 +45,7 @@ jobs:
4545
- name: Configure for GitHub Pages on master
4646
run: |
4747
owner=$(jq --raw-output .repository.owner.login ${GITHUB_EVENT_PATH})
48-
repository=$(jq .repository.name ${GITHUB_EVENT_PATH})
48+
repository=$(jq --raw-output .repository.name ${GITHUB_EVENT_PATH})
4949
echo "BASE_URL=/${repository}" >> ../env.sh
5050
echo "ORIGIN=${owner}/${repository}" >> ../env.sh
5151
echo "TARGET_BRANCH=gh-pages" >> ../env.sh
@@ -85,6 +85,13 @@ jobs:
8585
if ! git checkout --track deploy/${TARGET_BRANCH}; then
8686
git checkout -b ${TARGET_BRANCH} remotes/origin/asf-site
8787
fi
88+
if [ "$ORIGIN" != "apache/arrow-site" ]; then
89+
# Pull latest asf-site (for docs etc.) if we're not already on it
90+
git remote add apache https://github.com/apache/arrow-site.git
91+
git fetch apache
92+
git reset --hard apache/asf-site
93+
PUSH_ARGS="-f"
94+
fi
8895
rsync \
8996
-a \
9097
--delete \
@@ -96,11 +103,12 @@ jobs:
96103
-a \
97104
../build/docs/ \
98105
docs/
106+
touch .nojekyll
99107
if [ "$(git status --porcelain)" != "" ]; then
100108
# There are changes to the built site
101109
git add --all
102110
git commit -m "Updating built site (build ${GITHUB_SHA})"
103-
git push deploy ${TARGET_BRANCH}
111+
git push ${PUSH_ARGS} deploy ${TARGET_BRANCH}
104112
else
105113
echo "No changes to the built site"
106114
fi

‎_config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ exclude:
3434
- README.md
3535
- vendor
3636
- themes
37+
- release-announcement-template.md
3738

3839
collections:
3940
docs:

‎_data/committers.yml

+209
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to you under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
# Database of Apache Arrow committers and PMC
17+
#
18+
- name: Jacques Nadeau
19+
role: VP
20+
alias: jacques
21+
affiliation: Dremio
22+
- name: Ted Dunning
23+
role: PMC
24+
alias: tdunning
25+
affiliation: MapR
26+
- name: P. Taylor Goetz
27+
role: PMC
28+
alias: ptgoetz
29+
affiliation: Monetate
30+
- name: Julian Hyde
31+
role: PMC
32+
alias: jhyde
33+
affiliation: Looker
34+
- name: Reynold Xin
35+
role: PMC
36+
alias: rxin
37+
affiliation: Databricks
38+
- name: James Taylor
39+
role: PMC
40+
alias: jamestaylor
41+
affiliation: Salesforce
42+
- name: Julien Le Dem
43+
role: PMC
44+
alias: julien
45+
affiliation: Datakin
46+
- name: Jake Luciani
47+
role: PMC
48+
alias: jake
49+
affiliation: DataStax
50+
- name: Jason Altekruse
51+
role: PMC
52+
alias: json
53+
affiliation: Workday
54+
- name: Alex Levenson
55+
role: PMC
56+
alias: alexlevenson
57+
affiliation: Twitter
58+
- name: Parth Chandra
59+
role: PMC
60+
alias: parthc
61+
affiliation: MapR
62+
- name: Marcel Kornacker
63+
role: PMC
64+
alias: marcel
65+
affiliation: Independent
66+
- name: Steven Phillips
67+
role: PMC
68+
alias: smp
69+
affiliation: Dremio
70+
- name: Hanifi Gunes
71+
role: PMC
72+
alias: hg
73+
affiliation: MZ
74+
- name: Abdelhakim Deneche
75+
role: PMC
76+
alias: adeneche
77+
affiliation: Salesforce
78+
- name: Wes McKinney
79+
role: PMC
80+
alias: wesm
81+
affiliation: Ursa Labs / RStudio
82+
- name: David Alves
83+
role: Committer
84+
alias: dralves
85+
affiliation: CortexXus
86+
- name: Ippokratis Pandis
87+
role: Committer
88+
alias: ippokratis
89+
affiliation: Amazon
90+
- name: Uwe L. Korn
91+
role: PMC
92+
alias: uwe
93+
affiliation: Quantco
94+
- name: Kouhei Sutou
95+
role: PMC
96+
alias: kou
97+
affiliation: ClearCode
98+
- name: Philipp Moritz
99+
role: PMC
100+
alias: pcmoritz
101+
affiliation: Anyscale
102+
- name: Phillip Cloud
103+
role: PMC
104+
alias: cpcloud
105+
affiliation: Standard Cognition
106+
- name: Bryan Cutler
107+
role: Committer
108+
alias: cutlerb
109+
affiliation: IBM
110+
- name: Li Jin
111+
role: Committer
112+
alias: icexelloss
113+
affiliation: Two Sigma
114+
- name: Siddharth Teotia
115+
role: PMC
116+
alias: siddteotia
117+
affiliation: LinkedIn
118+
- name: Brian Hulette
119+
role: Committer
120+
alias: bhulette
121+
affiliation: Google
122+
- name: Robert Nishihara
123+
role: Committer
124+
alias: robertnishihara
125+
affiliation: Anyscale
126+
- name: Paul Taylor
127+
role: Committer
128+
alias: ptaylor
129+
affiliation: NVIDIA
130+
- name: Antoine Pitrou
131+
role: PMC
132+
alias: apitrou
133+
affiliation: Independent / Ursa Labs
134+
- name: Andy Grove
135+
role: PMC
136+
alias: agrove
137+
affiliation: NVIDIA
138+
- name: Krisztián Szűcs
139+
role: PMC
140+
alias: kszucs
141+
affiliation: Ursa Labs
142+
- name: Yosuke Shiro
143+
role: Committer
144+
alias: shiro
145+
affiliation: Red Data Tools
146+
- name: Romain Francois
147+
role: Committer
148+
alias: romainfrancois
149+
affiliation: RStudio
150+
- name: Sebastien Binet
151+
role: PMC
152+
alias: sbinet
153+
affiliation: CERN
154+
- name: Paddy Horan
155+
role: Committer
156+
alias: paddyhoran
157+
affiliation: MetLife
158+
- name: Chao Sun
159+
role: Committer
160+
alias: sunchao
161+
affiliation: Uber
162+
- name: Micah Kornfield
163+
role: PMC
164+
alias: emkornfield
165+
affiliation: Google
166+
- name: Neville Dipale
167+
role: Committer
168+
alias: nevime
169+
affiliation: commutenav
170+
- name: François Saint-Jacques
171+
role: PMC
172+
alias: fsaintjacques
173+
affiliation: Ursa Labs / RStudio
174+
- name: Praveen Kumar
175+
role: Committer
176+
alias: praveenbingo
177+
affiliation: Dremio
178+
- name: David Li
179+
role: Committer
180+
alias: lidavidm
181+
affiliation: Two Sigma
182+
- name: Ben Kietzman
183+
role: Committer
184+
alias: bkietz
185+
affiliation: Ursa Labs / RStudio
186+
- name: Kenta Murata
187+
role: Committer
188+
alias: mrkn
189+
affiliation: Speee, Inc.
190+
- name: Neal Richardson
191+
role: PMC
192+
alias: npr
193+
affiliation: Ursa Labs / RStudio
194+
- name: Eric Erhardt
195+
role: Committer
196+
alias: eerhardt
197+
affiliation: Microsoft
198+
- name: Joris van den Bossche
199+
role: Committer
200+
alias: jorisvandenbossche
201+
affiliation: Ursa Labs
202+
- name: Liya Fan
203+
role: Committer
204+
alias: liyafan
205+
affiliation: Alibaba
206+
- name: Ji Liu
207+
role: Committer
208+
alias: tianchen
209+
affiliation: Alibaba

‎_includes/blog_header.html

+13-12
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
limitations under the License.
1616
{% endcomment %}
1717
<h1>
18-
{{ post.title }}
18+
{{ page.title }}
1919
</h1>
20+
<hr class="mt-4 mb-3">
2021

2122
{% capture discard %}
2223
{% comment %}
@@ -25,41 +26,41 @@ <h1>
2526
{% endcomment %}
2627
{% assign author_name = nil %}
2728
{% for c in site.data.contributors %}
28-
{% if c.apacheId == post.author %}
29+
{% if c.apacheId == page.author %}
2930
{% assign author_name = c.name %}
3031
{% if c.homepage %}
3132
{% assign homepage = c.homepage %}
3233
{% else if c.githubId %}
33-
{% capture homepage %}http://github.com/{{ c.githubId }}{% endcapture %}
34+
{% capture homepage %}https://github.com/{{ c.githubId }}{% endcapture %}
3435
{% else %}
35-
{% capture homepage %}http://people.apache.org/~{{ post.author }}{% endcapture %}
36+
{% capture homepage %}https://people.apache.org/~{{ page.author }}{% endcapture %}
3637
{% endif %}
3738
{% if c.avatar %}
3839
{% assign avatar = c.avatar %}
3940
{% else %}
40-
{% capture avatar %}http://github.com/{{ c.githubId }}.png{% endcapture %}
41+
{% capture avatar %}https://github.com/{{ c.githubId }}.png{% endcapture %}
4142
{% endif %}
4243
{% endif %}
4344
{% endfor %}
4445
{% endcapture %}{% assign discard = nil %}
4546

46-
<p>
47+
<p class="mb-4 pb-1">
4748
<span class="badge badge-secondary">Published</span>
48-
<span class="published">
49-
{{ post.date | date_to_string }}
49+
<span class="published mr-3">
50+
{{ page.date | date_to_string }}
5051
</span>
5152
<br />
5253
<span class="badge badge-secondary">By</span>
5354
{% if author_name %}
54-
<a href="{{ homepage }}">{{ author_name }} ({{ post.author }}) </a>
55+
<a class="mr-3" href="{{ homepage }}">{{ author_name }} ({{ page.author }}) </a>
5556
{% else %}
56-
{{ post.author }}
57+
{{ page.author }}
5758
{% endif %}
5859

59-
{% if post.translations %}
60+
{% if page.translations %}
6061
<br />
6162
<span class="badge badge-secondary">Translations</span>
62-
{% for trans in post.translations %}
63+
{% for trans in page.translations %}
6364
<a href="{{ site.baseurl }}/blog/{{ trans.url }}">{{ trans.language }}</a>
6465
{% endfor %}
6566
{% endif %}

‎_includes/footer.html

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<hr/>
22
<footer class="footer">
3-
<p>Apache Arrow, Arrow, Apache, the Apache feather logo, and the Apache Arrow project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
4-
<p>&copy; 2016-{{ site.time | date: "%Y" }} The Apache Software Foundation</p>
3+
<div class="row">
4+
<div class="col-md-9">
5+
<p>Apache Arrow, Arrow, Apache, the Apache feather logo, and the Apache Arrow project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.</p>
6+
<p>&copy; 2016-{{ site.time | date: "%Y" }} The Apache Software Foundation</p>
7+
</div>
8+
<div class="col-md-3">
9+
<a class="d-sm-none d-md-inline pr-2" href="https://www.apache.org/events/current-event.html">
10+
<img src="https://www.apache.org/events/current-event-234x60.png"/>
11+
</a>
12+
</div>
513
{% asset main.js %}
614
</footer>

0 commit comments

Comments
 (0)