You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2024/04/12 10:06:19 UTC
(logging-parent) 07/07: Fix bash typo and move website workflow to another file
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/11.0.0-test2
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 2a37359d5455ef326ed216877b5ba68d44a6578f
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Fri Apr 12 12:04:34 2024 +0200
Fix bash typo and move website workflow to another file
---
.github/workflows/build.yaml | 31 ++--------------------
.github/workflows/deploy-site-reusable.yaml | 3 ---
.github/workflows/deploy-site.yaml | 29 ++++++++++++++++++++
.../ROOT/pages/release-instructions-project.adoc | 7 +++--
src/site/antora/modules/ROOT/pages/usage.adoc | 2 +-
5 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5209398..0be2b40 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,10 +23,12 @@ on:
- "main"
- "release/*"
paths-ignore:
+ - "**.adoc"
- "**.md"
- "**.txt"
pull_request:
paths-ignore:
+ - "**.adoc"
- "**.md"
- "**.txt"
@@ -71,32 +73,3 @@ jobs:
contents: write
with:
project-id: logging-parent
-
- export-release-version:
- needs: deploy-release
- runs-on: ubuntu-latest
- outputs:
- version: ${{ steps.export-version.outputs.version }}
- steps:
- - name: Export version
- id: export-version
- run: |
- version=$(echo "${{ github.ref_name }}" | sed 's/^release\///')
- echo "version=$result" >> "$GITHUB_OUTPUT"
-
- deploy-release-site:
- needs: export-release-version
- uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
- # Secrets for committing the generated site
- secrets:
- GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
- # Write permissions for committing the generated site
- permissions:
- contents: write
- with:
- asf-yaml-content: |
- staging:
- profile: ~
- whoami: ${{ github.ref_name }}-site-stg-out
- subdir: content/logging-parent-${{ needs.export-release-version.outputs.version }}
- target-branch: ${{ github.ref_name }}-site-stg-out
diff --git a/.github/workflows/deploy-site-reusable.yaml b/.github/workflows/deploy-site-reusable.yaml
index de27856..6afb0c6 100644
--- a/.github/workflows/deploy-site-reusable.yaml
+++ b/.github/workflows/deploy-site-reusable.yaml
@@ -131,7 +131,6 @@ jobs:
env:
TARGET_BRANCH: ${{ inputs.target-branch }}
run: |
- set -x
git ls-remote --exit-code --heads origin "refs/heads/$TARGET_BRANCH" >/dev/null 2>&1 || {
echo "Remote branch \`$TARGET_BRANCH\` doesn't exist, creating it"
git checkout --orphan "$TARGET_BRANCH"
@@ -153,8 +152,6 @@ jobs:
ASF_YAML_CONTENT: ${{ inputs.asf-yaml-content }}
run: |
- set -x
-
# Check if there already exists an `.asf.yaml`
ASF_YAML_EXISTS=$([ -f .asf.yaml ] && echo "true" || echo "false")
diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
index 7679ddb..11bda9d 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -64,3 +64,32 @@ jobs:
subdir: content/logging-parent
source-branch: ${{ github.ref_name }}
target-branch: ${{ github.ref_name }}-out
+
+ export-version:
+ if: github.repository == 'apache/logging-parent' && startsWith(github.ref_name, 'release/')
+ runs-on: ubuntu-latest
+ outputs:
+ version: ${{ steps.export-version.outputs.version }}
+ steps:
+ - name: Export version
+ id: export-version
+ run: |
+ version=$(echo "${{ github.ref_name }}" | sed 's/^release\///')
+ echo "version=$version" >> "$GITHUB_OUTPUT"
+
+ deploy-site-rel:
+ needs: export-version
+ uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@main
+ # Secrets for committing the generated site
+ secrets:
+ GPG_SECRET_KEY: ${{ secrets.LOGGING_GPG_SECRET_KEY }}
+ # Write permissions for committing the generated site
+ permissions:
+ contents: write
+ with:
+ asf-yaml-content: |
+ staging:
+ profile: ~
+ whoami: ${{ github.ref_name }}-site-stg-out
+ subdir: content/logging-parent-${{ needs.export-version.outputs.version }}
+ target-branch: ${{ github.ref_name }}-site-stg-out
diff --git a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
index 1981f10..92533ac 100644
--- a/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
+++ b/src/site/antora/modules/ROOT/pages/release-instructions-project.adoc
@@ -204,10 +204,9 @@ svn commit -m 'Remove `{project-id}` version `7.8.0` files released'
[#publish-release-github]
=== In GitHub
-{project-github-url}/releases/new[Create a new release in GitHub]:
-
-* Use the `rel/7.8.0` tag
-* Copy release notes from the generated emails
+. {project-github-url}/releases/new[Create a new release in GitHub]:
+** Use the `rel/7.8.0` tag
+** Copy release notes from the generated emails
[#publish-release-website]
== Publish the release website
diff --git a/src/site/antora/modules/ROOT/pages/usage.adoc b/src/site/antora/modules/ROOT/pages/usage.adoc
index e136cac..0c9d810 100644
--- a/src/site/antora/modules/ROOT/pages/usage.adoc
+++ b/src/site/antora/modules/ROOT/pages/usage.adoc
@@ -41,7 +41,7 @@ You can use {project-name} as follows:
== Website deployment
Using `deploy-site-reusable.yaml` reusable GitHub Actions workflow, you can automate the website deployments for staging and production environments.
-See how {project-github-url}/blob/main/.github/workflows/deploy.yaml[`deploy.yaml`] and {project-github-url}/blob/main/.github/workflows/deploy-site.yaml[`deploy-site.yaml`] of {project-name} achieves that using the following repository branching scheme:
+See how {project-github-url}/blob/main/.github/workflows/deploy-site.yaml[`deploy-site.yaml` of {project-name}] achieves that using the following repository branching scheme:
Staging website:: {site-url-staging}[]