From 2f2d01871126dd075cd8c26fb450c58ccd063340 Mon Sep 17 00:00:00 2001 From: Tilmann Date: Thu, 14 Aug 2025 18:09:25 +0200 Subject: [PATCH 1/4] Test --- .github/workflows/build-site.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index 3559139..93ebfa0 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -21,7 +21,6 @@ jobs: with: fetch-depth: 1 - - name: Build Site run: | mvn clean compile From 0e1ad4dbdb2a7ac65cc2a753b04abc4a1c117b35 Mon Sep 17 00:00:00 2001 From: Tilmann Date: Thu, 14 Aug 2025 21:36:11 +0200 Subject: [PATCH 2/4] Alignment with JDO site --- .github/workflows/build-site.yml | 3 ++- .github/workflows/deploy-site.yml | 18 ++++++++---------- .github/workflows/recreate-site-branch.yml | 13 ++++++------- pom.xml | 11 ++--------- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build-site.yml b/.github/workflows/build-site.yml index 93ebfa0..91a18e0 100644 --- a/.github/workflows/build-site.yml +++ b/.github/workflows/build-site.yml @@ -17,10 +17,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 1 + - name: Build Site run: | mvn clean compile diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml index d854066..ed67e29 100644 --- a/.github/workflows/deploy-site.yml +++ b/.github/workflows/deploy-site.yml @@ -18,8 +18,9 @@ on: paths: - 'src/main/asciidoc/**' - 'src/main/template/**' + - 'src/main/resources/**' - '.asf.yaml.publish' - - '.htaccess' + - 'pom.xml' jobs: @@ -36,7 +37,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 1 @@ -52,7 +53,7 @@ jobs: id: short-sha run: | short_sha=$(git rev-parse --short=10 $GITHUB_SHA) - echo "::set-output name=SHORT_SHA::$short_sha" + echo "SHORT_SHA=$short_sha" >> "$GITHUB_OUTPUT" # Determines the author data of the HEAD commit @@ -66,8 +67,8 @@ jobs: author_email=$(git log -1 --format='%aE' HEAD) echo "Setting up author data to use for deploy commit" - git config --local user.name $author_name - git config --local user.email $author_email + git config --local user.name "$author_name" + git config --local user.email "$author_email" # Adds additional configuration files that are supposed to be included in the page deploy to the build directory @@ -77,8 +78,6 @@ jobs: if: success() run: | cp -v .asf.yaml.publish target/site/.asf.yaml - cp -v .htaccess target/site/ - - name: Check Out Site Branch if: success() @@ -105,7 +104,6 @@ jobs: if: success() run: | mv -v target/site/.asf.yaml ./ - mv -v target/site/.htaccess ./ # Moves the new site resources from the build directory to the content directory @@ -113,7 +111,7 @@ jobs: if: success() run: | mkdir -v content - mv -v target/site/* content/ + mv -v target/site/* ./ # Explicitly removes build dir # This checks whether there are any remaining resources that were not moved to the correct location @@ -152,7 +150,7 @@ jobs: has_staged_changes=true fi - echo "::set-output name=HAS_STAGED_CHANGES::$has_staged_changes" + echo "HAS_STAGED_CHANGES=$has_staged_changes" >> "$GITHUB_OUTPUT" # Publishes the build results diff --git a/.github/workflows/recreate-site-branch.yml b/.github/workflows/recreate-site-branch.yml index 8670039..d3913c4 100644 --- a/.github/workflows/recreate-site-branch.yml +++ b/.github/workflows/recreate-site-branch.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: main fetch-depth: 1 @@ -43,7 +43,7 @@ jobs: id: short-sha run: | short_sha=$(git rev-parse --short=10 $GITHUB_SHA) - echo "::set-output name=SHORT_SHA::$short_sha" + echo "SHORT_SHA=$short_sha" >> "$GITHUB_OUTPUT" # Determines the author data of the HEAD commit @@ -57,8 +57,8 @@ jobs: author_email=$(git log -1 --format='%aE' HEAD) echo "Setting up author data to use for deploy commit" - git config --local user.name $author_name - git config --local user.email $author_email + git config --local user.name "$author_name" + git config --local user.email "$author_email" # Creates and checks out a new orphan branch used to publish the site @@ -76,7 +76,7 @@ jobs: git reset rm .gitignore git add target/site - git add .asf.yaml.publish .htaccess + git add .asf.yaml.publish git clean -df @@ -84,8 +84,7 @@ jobs: - name: Move Content and Site Configuration if: success() run: | - mkdir -v content - git mv -v target/site/* content/ + git mv -v target/site/* ./ git mv -v .asf.yaml.publish .asf.yaml diff --git a/pom.xml b/pom.xml index 1e08264..b94ea8f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache apache - 23 + 26 org.apache.db @@ -47,7 +47,7 @@ This repository contains the sources for the Apache DB website UTF-8 - 2.1.0 + 3.1.1 3.2.0 ${project.basedir}/target/site @@ -113,13 +113,6 @@ This repository contains the sources for the Apache DB website - - maven-compiler-plugin - - 1.8 - 1.8 - - org.asciidoctor asciidoctor-maven-plugin From ea30c79f1a22b96afe3ee257610b1184aa99c6d1 Mon Sep 17 00:00:00 2001 From: Tilmann Date: Thu, 14 Aug 2025 21:42:26 +0200 Subject: [PATCH 3/4] Alignment with JDO site --- .asf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 68bab32..42f7c91 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -32,8 +32,8 @@ github: # # set up branch protection for site publishing branch to avoid accidental deletion # force-pushes are still necessary as they are used to deploy new versions of the site - publish: - allow_force_pushes: true + #publish: + # allow_force_pushes: true notifications: commits: notifications@db.apache.org From f57de8001cc826cfc60765ed802229194f86ef12 Mon Sep 17 00:00:00 2001 From: Tilmann Date: Fri, 15 Aug 2025 19:35:12 +0200 Subject: [PATCH 4/4] Alignment with JDO site --- .htaccess | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .htaccess diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 8f1d4fc..0000000 --- a/.htaccess +++ /dev/null @@ -1,3 +0,0 @@ -RewriteEngine On -RewriteBase / -RewriteRule ^(?!content/)(.*)$ content/$1