This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch new-site-dev
in repository https://gitbox.apache.org/repos/asf/pinot-site.git
The following commit(s) were added to refs/heads/new-site-dev by this push:
new b30dcd2f New site dev (#99)
b30dcd2f is described below
commit b30dcd2f2301089fcf7d7f265fe6aa62392067f1
Author: Gio <[email protected]>
AuthorDate: Sat Apr 6 08:12:15 2024 +0200
New site dev (#99)
* Add new Apache Pinot site written in Next.js, TypeScript, TailwindCSS,
ContentLayer
* Add build and publish pipelines
* Fix typo in publish workflow
* Fix publish workflow. Set the correct node version
* Use forked repo to test publish pipeline
* Use new-static-prod branch to test the publish pipeline
* Fix deployment script
* New pipeline
* Fix pipeline again
* again
* again 2
* Add github token
* Try again
* Add echos
* repo and github tokens
* Try PAT
* Cleanup
* Cleanup
* Cleanup workflows for new-dev as well
* publish-site.sh add withRef
* publish-site.sh fix withRef
* Force build after setting right - hopefully - permissions
* Remove publish-site.sh from dev branch as it's a duplicate
* Add Release 1.1.0 to dev branch
---
.github/workflows/website-build.yml | 2 +-
.github/workflows/website-publish.yml | 30 +++++++++++---
data/downloads/1.1.0.mdx | 16 ++++++++
scripts/publish-site.sh | 77 -----------------------------------
4 files changed, 41 insertions(+), 84 deletions(-)
diff --git a/.github/workflows/website-build.yml
b/.github/workflows/website-build.yml
index fd5cfd75..137a4b2c 100644
--- a/.github/workflows/website-build.yml
+++ b/.github/workflows/website-build.yml
@@ -1,4 +1,4 @@
-name: Build and Test New Website
+name: Build Website
on:
pull_request:
diff --git a/.github/workflows/website-publish.yml
b/.github/workflows/website-publish.yml
index 1ac598f5..c4c9a080 100644
--- a/.github/workflows/website-publish.yml
+++ b/.github/workflows/website-publish.yml
@@ -1,4 +1,23 @@
-name: Publish New Website to Production
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: Publish Website
on:
push:
@@ -11,6 +30,8 @@ jobs:
steps:
- uses: actions/checkout@v2
+ with:
+ ref: 'new-static-prod'
- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
@@ -22,8 +43,5 @@ jobs:
node-version: "${{ steps.nvm.outputs.NVMRC }}"
- name: Deploy website
- run: ./scripts/publish-site.sh
- env:
- GITHUB_TOKEN: ${{ github.token }}
- REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- GH_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
+ run: |
+ .github/workflows/scripts/publish-site.sh
diff --git a/data/downloads/1.1.0.mdx b/data/downloads/1.1.0.mdx
new file mode 100644
index 00000000..45cafd86
--- /dev/null
+++ b/data/downloads/1.1.0.mdx
@@ -0,0 +1,16 @@
+---
+version: 1.1.0
+date: 25/03/2024
+href:
https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-bin.tar.gz
+officialSource:
+ download:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-src.tar.gz'
+ sha512:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-src.tar.gz.sha512'
+ asc:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-src.tar.gz.asc'
+binary:
+ download:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-bin.tar.gz'
+ sha512:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-bin.tar.gz.sha512'
+ asc:
'https://downloads.apache.org/pinot/apache-pinot-1.1.0/apache-pinot-1.1.0-bin.tar.gz.asc'
+releaseNotes: 'This release comes with several features, SQL /UI/Perf
enhancements Bugfixes across areas ranging from Multistage Query Engine to
Ingestion, Storage format, SQL support, etc.'
+---
+
+This release comes with several features, SQL /UI/Perf enhancements Bugfixes
across areas ranging from Multistage Query Engine to Ingestion, Storage format,
SQL support, etc.
diff --git a/scripts/publish-site.sh b/scripts/publish-site.sh
deleted file mode 100755
index e3865fd3..00000000
--- a/scripts/publish-site.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-
-#!/bin/bash
-
-set -x -e
-
-# Define variables
-DEPLOY_BRANCH="new-static-prod"
-ORIGIN_REPO="https://github.com/apache/pinot-site";
-DEV_BRANCH="new-site-dev"
-BUILD_DIR="/tmp/pinot-new-site-build"
-TEMP_DIR="/tmp/pinot-temp"
-
-echo "Starting deployment process..."
-echo "ORIGIN_REPO: $ORIGIN_REPO"
-
-# Cleanup any previous build artifacts and prepare build directory
-rm -rf $BUILD_DIR
-mkdir -p $BUILD_DIR
-
-# Setup: Ensure temp directory exists
-mkdir -p $TEMP_DIR
-
-# Clone the repo and switch to the development branch
-git clone "$ORIGIN_REPO" $BUILD_DIR
-cd $BUILD_DIR
-git checkout $DEV_BRANCH
-
-# Preserve .gitignore and any other critical files
-if [ -f .gitignore ]; then
- mv .gitignore $TEMP_DIR/
-fi
-
-# Capture commit ID and message for use in the deployment commit
-COMMIT_ID=$(git rev-parse HEAD)
-GIT_MSG=$(git log -1 --pretty=format:"%s")
-
-echo "Building the project..."
-# Build the website
-yarn install
-yarn run build
-
-# Debugging: List contents after build
-echo "Listing contents of build output directory..."
-ls -l $BUILD_DIR/out
-
-# Verify build directory exists and has content
-if [ -d "$BUILD_DIR/out" ] && [ "$(ls -A $BUILD_DIR/out)" ]; then
- echo "Directory exists and is not empty, proceeding with copying..."
-else
- echo "Build output directory does not exist or is empty, exiting..."
- exit 1
-fi
-
-# Prepare the new-static-prod branch for the new build
-git fetch origin $DEPLOY_BRANCH
-git checkout $DEPLOY_BRANCH
-
-# Replace old files with new build
-git rm -rf .
-
-# Restore .gitignore
-if [ -f "$TEMP_DIR/.gitignore" ]; then
- mv $TEMP_DIR/.gitignore .
-fi
-
-cp -r $BUILD_DIR/out/* .
-
-# Config git
-git config user.name "Pinot Site Updater"
-git config user.email "[email protected]"
-
-# Commit and push changes
-git add .
-git commit -m "Update Pinot Site from dev branch ${COMMIT_ID}" -m "$GIT_MSG"
-git push origin $DEPLOY_BRANCH
-
-echo "Deployment to ${DEPLOY_BRANCH} completed successfully."
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
