You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2022/03/17 11:40:45 UTC

[bookkeeper] branch master updated: [website] deploy staging after every change (#3118)

This is an automated email from the ASF dual-hosted git repository.

eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new c112637  [website] deploy staging after every change (#3118)
c112637 is described below

commit c112637ec8be2a2f3a6baf6a28bed11934bd4b6f
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Thu Mar 17 12:40:36 2022 +0100

    [website] deploy staging after every change (#3118)
---
 .github/workflows/backward-compat-tests.yml                |  1 +
 .github/workflows/bookie-tests.yml                         |  1 +
 .github/workflows/client-tests.yml                         |  1 +
 .github/workflows/compatibility-check-java11.yml           |  1 +
 .github/workflows/compatibility-check-java8.yml            |  1 +
 .github/workflows/integration-tests.yml                    |  1 +
 .github/workflows/owasp-dep-check.yml                      |  1 +
 .github/workflows/pr-validation.yml                        |  1 +
 .github/workflows/remaining-tests.yml                      |  1 +
 .github/workflows/replication-tests.yml                    |  1 +
 .github/workflows/stream-tests.yml                         |  1 +
 .github/workflows/tls-tests.yml                            |  1 +
 ...website-new-deploy.yaml => website-staging-deploy.yaml} | 14 +++++++++-----
 site3/website/scripts/publish-website.sh                   |  4 ++--
 14 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/backward-compat-tests.yml b/.github/workflows/backward-compat-tests.yml
index 8efa06f..fbed344 100644
--- a/.github/workflows/backward-compat-tests.yml
+++ b/.github/workflows/backward-compat-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/bookie-tests.yml b/.github/workflows/bookie-tests.yml
index d18acc0..767e9a3 100644
--- a/.github/workflows/bookie-tests.yml
+++ b/.github/workflows/bookie-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/client-tests.yml b/.github/workflows/client-tests.yml
index 2ce243a..0a868fe 100644
--- a/.github/workflows/client-tests.yml
+++ b/.github/workflows/client-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/compatibility-check-java11.yml b/.github/workflows/compatibility-check-java11.yml
index 52c23e6..101f24d 100644
--- a/.github/workflows/compatibility-check-java11.yml
+++ b/.github/workflows/compatibility-check-java11.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/compatibility-check-java8.yml b/.github/workflows/compatibility-check-java8.yml
index e5e9b94..1045ad0 100644
--- a/.github/workflows/compatibility-check-java8.yml
+++ b/.github/workflows/compatibility-check-java8.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 29ecf36..6d704b2 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/owasp-dep-check.yml b/.github/workflows/owasp-dep-check.yml
index a3fbdff..7edce7a 100644
--- a/.github/workflows/owasp-dep-check.yml
+++ b/.github/workflows/owasp-dep-check.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index fa914ec..00b8a1a 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/remaining-tests.yml b/.github/workflows/remaining-tests.yml
index 214b421..0bc1d14 100644
--- a/.github/workflows/remaining-tests.yml
+++ b/.github/workflows/remaining-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/replication-tests.yml b/.github/workflows/replication-tests.yml
index 21c4755..954f617 100644
--- a/.github/workflows/replication-tests.yml
+++ b/.github/workflows/replication-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/stream-tests.yml b/.github/workflows/stream-tests.yml
index 28a7fcf..50923fd 100644
--- a/.github/workflows/stream-tests.yml
+++ b/.github/workflows/stream-tests.yml
@@ -26,6 +26,7 @@ on:
       - master
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/tls-tests.yml b/.github/workflows/tls-tests.yml
index 9d94fe0..4673f55 100644
--- a/.github/workflows/tls-tests.yml
+++ b/.github/workflows/tls-tests.yml
@@ -27,6 +27,7 @@ on:
       - branch-*
     paths-ignore:
       - 'site/**'
+      - 'site3/**'
     workflow_dispatch:
 
 env:
diff --git a/.github/workflows/website-new-deploy.yaml b/.github/workflows/website-staging-deploy.yaml
similarity index 83%
rename from .github/workflows/website-new-deploy.yaml
rename to .github/workflows/website-staging-deploy.yaml
index 69814ae..5ff217f 100644
--- a/.github/workflows/website-new-deploy.yaml
+++ b/.github/workflows/website-staging-deploy.yaml
@@ -17,15 +17,19 @@
 # under the License.
 #
 
-name: Website deploy
+name: Website staging deploy
 on:
-  schedule:
-  # DISABLED UNTIL WE DECIDE TO DEPLOY IT
-  #  - cron: '0 */24 * * *'
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+    paths:
+      - 'site3/**'
+      - '.github/workflows/website-staging-deploy.yaml'
 
 jobs:
   build-website:
-    name: Build and publish website
+    name: Build and stage website
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
diff --git a/site3/website/scripts/publish-website.sh b/site3/website/scripts/publish-website.sh
index d5badfb..2e9f157 100755
--- a/site3/website/scripts/publish-website.sh
+++ b/site3/website/scripts/publish-website.sh
@@ -35,12 +35,12 @@ TMP_DIR=/tmp/bookkeeper-site
   git clone "https://$ORIGIN_REPO" .
   git config user.name "Apache BookKeeper Site Updater"
   git config user.email "dev@bookkeeper.apache.org"
-  git checkout asf-site
+  git checkout asf-staging
   # copy the apache generated dir
   cp -r $ROOT_DIR/site3/website/build/* $TMP_DIR/content
 
   git add -A .
-  git diff-index --quiet HEAD || (git commit -m "Updated site at revision $REVISION" && git push -q origin HEAD:asf-site)
+  git diff-index --quiet HEAD || (git commit -m "Updated site at revision $REVISION" && git push -q origin HEAD:asf-staging)
 
   rm -rf $TMP_DIR
 )