[avro] branch avro-3686-asf.yaml-docs updated (0b4c7aab4 -> d8a453709)

[mg...@apache.org]

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

mgrigorov pushed a change to branch avro-3686-asf.yaml-docs
in repository https://gitbox.apache.org/repos/asf/avro.git


    omit 0b4c7aab4 AVRO-3686: Automate the creation of the target site branch
     new d8a453709 AVRO-3686: Automate the creation of the target site branch

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0b4c7aab4)
            \
             N -- N -- N   refs/heads/avro-3686-asf.yaml-docs (d8a453709)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/docs.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[avro] 01/01: AVRO-3686: Automate the creation of the target site branch

[mg...@apache.org]

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

mgrigorov pushed a commit to branch avro-3686-asf.yaml-docs
in repository https://gitbox.apache.org/repos/asf/avro.git

commit d8a453709440db9f7ab3eedcacafb9893dc19c4f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Tue Dec 20 15:58:54 2022 +0200

    AVRO-3686: Automate the creation of the target site branch
    
    Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
---
 .asf.yaml                   |  4 ++--
 .github/workflows/docs.yaml | 43 +++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 8580b6ab8..876182e6d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -50,5 +50,5 @@ notifications:
   jira_options: link label worklog
 
 publish:
-  whoami: site-staging
-  subdir: next
+  whoami: TARGET_BRANCH
+  subdir: SUBDIR
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 9b36c6cef..02316f885 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -33,13 +33,20 @@ jobs:
   build-docs:
     runs-on: ubuntu-20.04
     steps:
+      - name: Checkout docs sources
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
       - name: Set target branch
         id: variables
         run: |
           set -x
+          VERSION=$(cat share/VERSION.txt)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
           if test '${{ github.ref }}' = 'refs/heads/avro-3686-asf.yaml-docs'; then
             echo "target-branch=site-staging" >> $GITHUB_OUTPUT
-            echo "baseUrl=/next" >> $GITHUB_OUTPUT
+            echo "baseUrl=/$VERSION" >> $GITHUB_OUTPUT
           elif test '${{ github.ref_type }}' = 'tag'; then
             echo "target-branch=site-production" >> $GITHUB_OUTPUT
             echo "baseUrl=/" >> $GITHUB_OUTPUT
@@ -48,18 +55,6 @@ jobs:
             exit 1
           fi
 
-      - name: Checkout docs sources
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Checkout docs target branch
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ steps.variables.outputs.target-branch }}
-          path: docs-target
-
       - uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -82,21 +77,25 @@ jobs:
           cd doc
           hugo --minify --destination ../website --baseURL=${{ steps.variables.outputs.baseUrl }}
 
-      # TODO build the C/C++/C# docs
-
       - name: Copy & push the generated HTML
         run: |
+          # TODO build the C/C++/C# docs for master/staging
           set -x
-          cd docs-target
-          # delete anything but: 1) '.'; 2) '..'; 3) .git/
-          find ./ | grep -vE "^./$|^../$|^./.git" | xargs rm -rf
-          cp ../.asf.yaml .
-          cp -r ../website/* .
-          # TODO copy the C/C++/C# docs
+          sed -i -e "s|TARGET_BRANCH|${{ steps.variables.outputs.target-branch }}|" .asf.yaml
+          sed -i -e "s|SUBDIR|${{ steps.variables.outputs.baseUrl }}|" .asf.yaml
+          cp .asf.yaml website/
+          git checkout -B ${{ steps.variables.outputs.target-branch }}
+          # delete anything but: 1) '.'; 2) '..'; 3) .git/; 4) website/
+          find ./ | grep -vE "^./$|^../$|^./.git|^./website" | xargs rm -rf
+          cp -r website/* .
+          cp -r website/.asf.yaml .
+          ls -la website/
+          rm -rf website
+          # TODO copy the C/C++/C# docs for master/staging
           if [ "$(git status --porcelain)" != "" ]; then
             git config user.name "github-actions[bot]"
             git config user.email "github-actions[bot]@users.noreply.github.com"
             git add --all
             git commit -m 'Publish built docs triggered by ${{ github.sha }}'
-            git push || git push --force
+            git push --set-upstream origin ${{ steps.variables.outputs.target-branch }} --force
           fi