You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/12/20 14:03:19 UTC
[avro] branch avro-3686-asf.yaml-docs updated (123c0fa14 -> d813d6a0f)
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
discard 123c0fa14 AVRO-3686: Automate the creation of the target site branch
new d813d6a0f 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 (123c0fa14)
\
N -- N -- N refs/heads/avro-3686-asf.yaml-docs (d813d6a0f)
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[avro] 01/01: AVRO-3686: Automate the creation of the target site branch
Posted by 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 d813d6a0f9e42b3c428d62c4e4c991cfe7853728
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>
---
.github/workflows/docs.yaml | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 9b36c6cef..b0b47f502 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -33,10 +33,17 @@ 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
@@ -48,17 +55,12 @@ 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
+# - 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:
@@ -82,15 +84,16 @@ 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
set -x
- cd docs-target
- # delete anything but: 1) '.'; 2) '..'; 3) .git/
+ cp .asf.yaml website/
+ git checkout -B ${{ steps.variables.outputs.target-branch }}
+# cd docs-target
+ # delete anything but: 1) '.'; 2) '..'; 3) .git/;
find ./ | grep -vE "^./$|^../$|^./.git" | xargs rm -rf
- cp ../.asf.yaml .
+# cp ../.asf.yaml .
cp -r ../website/* .
# TODO copy the C/C++/C# docs
if [ "$(git status --porcelain)" != "" ]; then
@@ -98,5 +101,5 @@ jobs:
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 }} || git push --force
fi