This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch update-site in repository https://gitbox.apache.org/repos/asf/avro.git
commit 4ebaa1222c74b85b44b14fd6f8af3ab64f340367 Author: Martin Tzvetanov Grigorov <[email protected]> AuthorDate: Thu Apr 13 11:54:27 2023 +0300 Fix the path for Java javadoc HTMLs Do not trigger the workflow for changes in the SDKs Signed-off-by: Martin Tzvetanov Grigorov <[email protected]> --- .asf.yaml | 4 ---- .github/workflows/docs.yaml | 19 ++++++++++++------- doc/content/en/docs/++version++/api-c++.md | 2 +- doc/content/en/docs/++version++/api-c.md | 2 +- doc/content/en/docs/++version++/api-csharp.md | 2 +- doc/content/en/docs/++version++/api-java.md | 2 +- doc/layouts/partials/navbar.html | 4 ++-- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index c12afbf8a..c5838695f 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -48,7 +48,3 @@ notifications: # Send individual PR comments/reviews to issues@ pullrequests_comment: [email protected] jira_options: link label worklog - -publish: - whoami: asf-site - subdir: asf-site diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 6074d7ec5..37da809c1 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -8,7 +8,6 @@ on: paths: - .github/workflows/docs.yaml - doc/** - - lang/c/** concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -44,7 +43,7 @@ jobs: run: | set -x cd doc - hugo --minify --destination ../website --baseURL=/asf-site + hugo --minify --destination ../website --baseURL=/update-site - uses: actions/upload-artifact@v3 with: @@ -139,14 +138,12 @@ jobs: run: | set -x cd lang/java - mvn -Pdist javadoc::aggregate - ls -la target - ls -la target/apidocs + mvn javadoc::aggregate - uses: actions/upload-artifact@v3 with: name: api-java - path: lang/java/target/apidocs + path: lang/java/target/site/apidocs push-website: name: Push website @@ -193,6 +190,11 @@ jobs: run: | set -x + mkdir -p website/docs/++version++/api/c + mkdir -p website/docs/++version++/api/cpp/html + mkdir -p website/docs/++version++/api/csharp/html + mkdir -p website/docs/++version++/api/java + mv api-c/* website/docs/++version++/api/c/ mv api-c++/* website/docs/++version++/api/cpp/html/ mv api-csharp/* website/docs/++version++/api/csharp/html/ @@ -206,7 +208,10 @@ jobs: --exclude '/.git/' \ ../website/ \ ./ - cp ../.asf.yaml . + echo "publish: + whoami: asf-site + subdir: asf-site + " > .asf.yaml touch .nojekyll git status --porcelain if [ "$(git status --porcelain)" != "" ]; then diff --git a/doc/content/en/docs/++version++/api-c++.md b/doc/content/en/docs/++version++/api-c++.md index 909049c68..2e0b229bd 100644 --- a/doc/content/en/docs/++version++/api-c++.md +++ b/doc/content/en/docs/++version++/api-c++.md @@ -2,7 +2,7 @@ title: "C++ API" linkTitle: "C++ API" weight: 102 -manualLink: ./docs/++version++/api/cpp/html/ +manualLink: ./api/cpp/html/ --- <!-- diff --git a/doc/content/en/docs/++version++/api-c.md b/doc/content/en/docs/++version++/api-c.md index 032bd2283..a01ddf509 100644 --- a/doc/content/en/docs/++version++/api-c.md +++ b/doc/content/en/docs/++version++/api-c.md @@ -2,7 +2,7 @@ title: "C API" linkTitle: "C API" weight: 101 -manualLink: ./docs/++version++/api/c/ +manualLink: ./api/c/ --- <!-- diff --git a/doc/content/en/docs/++version++/api-csharp.md b/doc/content/en/docs/++version++/api-csharp.md index e48ae8133..0f2839274 100644 --- a/doc/content/en/docs/++version++/api-csharp.md +++ b/doc/content/en/docs/++version++/api-csharp.md @@ -2,7 +2,7 @@ title: "C# API" linkTitle: "C# API" weight: 103 -manualLink: ./docs/++version++/api/csharp/html/ +manualLink: ./api/csharp/html/ --- <!-- diff --git a/doc/content/en/docs/++version++/api-java.md b/doc/content/en/docs/++version++/api-java.md index 3d2a494f4..e2a4c5cf9 100644 --- a/doc/content/en/docs/++version++/api-java.md +++ b/doc/content/en/docs/++version++/api-java.md @@ -2,7 +2,7 @@ title: "Java API" linkTitle: "Java API" weight: 100 -manualLink: ./docs/++version++/api/java/ +manualLink: ./api/java/ --- <!-- diff --git a/doc/layouts/partials/navbar.html b/doc/layouts/partials/navbar.html index 03c6e4854..60afafea9 100644 --- a/doc/layouts/partials/navbar.html +++ b/doc/layouts/partials/navbar.html @@ -19,13 +19,14 @@ --> +{{ $baseurl := urls.Parse $.Site.Params.Baseurl }} {{ $cover := and (.HasShortcode "blocks/cover") (not .Site.Params.ui.navbar_translucent_over_cover_disable) }} <nav class="js-navbar-scroll navbar navbar-expand navbar-dark {{ if $cover}} td-navbar-cover {{ end }}flex-column flex-md-row td-navbar"> <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}"> {{/* AVRO-3555: Don't inline the existing logo for now. <span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}{{ with resources.Get "icons/logo.svg" }}{{ ( . | minify).Content | safeHTML }}{{ end }}{{ end }}</span><span class="text-uppercase font-weight-bold">{{ .Site.Title }}</span> */}} - <span class="navbar-logo"><img src="./docs/++version++/logo.svg" width="100" height="30" style="margin: 0 10px"></span><span class="text-uppercase font-weight-bold">{{ .Site.Title }}</span> + <span class="navbar-logo"><img src="{{ $baseurl }}/docs/++version++/logo.svg" width="100" height="30" style="margin: 0 10px"></span><span class="text-uppercase font-weight-bold">{{ .Site.Title }}</span> </a> <div class="td-navbar-nav-scroll ml-md-auto" id="main_navbar"> @@ -40,7 +41,6 @@ {{ $pre := .Pre }} {{ $post := .Post }} {{ $url := urls.Parse .URL }} - {{ $baseurl := urls.Parse $.Site.Params.Baseurl }} <a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }}target="_blank" {{ end }}>{{ with .Pre}}{{ $pre }}{{ end }}<span{{if $active }} class="active"{{end}}>{{ .Name }}</span>{{ with .Post}}{{ $post }}{{ end }}</a> </li> {{ end }}
