Skip to content

Commit 3563721

Browse files
committed
Final Squash
Hard clear out of current production branch Pull from Staging update deploy workflow and branch name Update autoprefixer and postcss Disable search for now Update package.json Adding ignore ~ files to gitignore
1 parent 310860c commit 3563721

File tree

142 files changed

+1350
-25750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1350
-25750
lines changed

.github/workflows/deploy.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Build and Deploy Parquet Site
2+
3+
on:
4+
push:
5+
branches: [ production ]
6+
7+
jobs:
8+
Build_and_Deploy_Site:
9+
runs-on: ubuntu-20.04
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.ref }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
with:
15+
submodules: recursive
16+
fetch-depth: 0
17+
18+
- name: Setup Hugo
19+
uses: peaceiris/actions-hugo@v2
20+
with:
21+
hugo-version: 'latest'
22+
extended: true
23+
24+
- uses: actions/setup-node@v2
25+
with:
26+
node-version: '16'
27+
28+
- name: Cache dependencies
29+
uses: actions/cache@v1
30+
with:
31+
path: ~/.npm
32+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
33+
restore-keys: |
34+
${{ runner.os }}-node-
35+
36+
- run: npm install
37+
38+
- name: Build
39+
run: hugo --minify
40+
41+
- name: Deploy
42+
uses: peaceiris/actions-gh-pages@v3
43+
with:
44+
github_token: ${{ secrets.GITHUB_TOKEN }}
45+
publish_dir: public
46+
publish_branch: asf-site
47+
destination_dir: ./output
48+
keep_files: true

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.DS_Store
2+
/public
3+
resources/
4+
node_modules/
5+
package-lock.json
6+
.hugo_build.lock
7+
*~

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
[submodule "themes/docsy"]
3+
path = themes/docsy
4+
url = https://github.com/google/docsy

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

Gemfile

Lines changed: 0 additions & 11 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 139 deletions
This file was deleted.

LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,4 +202,3 @@
202202
limitations under the License.
203203

204204
--------------------------------------------------
205-

README.md

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
1-
# Apache Parquet Website
1+
# Parquet Website
22

3-
This is the website for Apache Parquet.
3+
This website is built / powered by [Hugo](https://gohugo.io/), and extended from the [Docsy Theme](https://www.docsy.dev/).
44

5-
### Development Setup
6-
We use middleman to generate the website content from markdown and other
7-
dynamic templates. The following steps assume you have a working
8-
ruby environment setup
5+
The following steps assume that you have `hugo` installed and working.
96

10-
gem install bundler
11-
bundle install
127

13-
### Generating the website
14-
---
15-
To generate the static wesbite for Apache Parquet run the following commands
8+
## Building and Running Locally
169

17-
bundle exec middleman build
10+
Clone this repository to run the website locally:
1811

12+
```shell
13+
git clone git@github.com:apache/parquet-site.git
14+
cd parquet-site
15+
git submodule update --init --recursive
16+
```
1917

20-
### Live Development
21-
---
22-
Live development of the site enables automatic reload when changes are saved.
23-
To enable run the following command and then open a browser and navigate to
24-
[http://localhost:4567](http://localhost:4567/)
18+
To build or update your site’s CSS resources, you also need PostCSS to create the final assets. By default npm installs tools under the directory where you run npm install.
2519

26-
bundle exec middleman
20+
```
21+
npm install -D autoprefixer
22+
npm install -D postcss-cli
23+
npm install -D postcss
24+
```
2725

26+
To run this website site locally, run the following in the root of the directory:
2827

29-
### Publishing the Site
30-
The website uses svnpubsub. The publish folder contains the websites content
31-
and when committed to the svn repository it will be automatically deployed to
32-
the live site.
28+
```shell
29+
hugo server
30+
```
3331

32+
# Website development and deployment
3433

35-
### Apache License
36-
---
37-
Except as otherwise noted this software is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)
34+
## Staging
3835

39-
Licensed under the Apache License, Version 2.0 (the "License");
40-
you may not use this file except in compliance with the License.
41-
You may obtain a copy of the License at
36+
To make a change to the `staging` version of the website:
37+
1. Make a PR against the `staging` branch in the repository
38+
2. Once the PR is merged, the `Build and Deploy Parquet Site`
39+
job in the [deployment workflow](./.github/workflows/deploy.yml) will be run, populating the `asf-staging` branch on this repo with the necessary files.
4240

43-
http://www.apache.org/licenses/LICENSE-2.0
41+
**Do not directly edit the `asf-staging` branch of this repo**
4442

45-
Unless required by applicable law or agreed to in writing, software
46-
distributed under the License is distributed on an "AS IS" BASIS,
47-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
48-
See the License for the specific language governing permissions and
49-
limitations under the License.
43+
## Production
44+
45+
To make a change to the `production` version of the website:
46+
1. Make a PR against the `production` branch in the repository
47+
2. Once the PR is merged, the `Build and Deploy Parquet Site`
48+
job in the [deployment workflow](./.github/workflows/deploy.yml) will be run, populating the `asf-site` branch on this repo with the necessary files.
49+
50+
**Do not directly edit the `asf-site` branch of this repo**

Rakefile

Lines changed: 0 additions & 23 deletions
This file was deleted.

assets/icons/logo.png

39.9 KB
Loading

0 commit comments

Comments
 (0)