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/18 14:08:00 UTC

(logging-log4j2) branch main updated: Switch CI release condition prefix to `release/3`

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

vy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/main by this push:
     new de2a3ba1af Switch CI release condition prefix to `release/3`
de2a3ba1af is described below

commit de2a3ba1afed6ff469893d9f6572dcd56ee4ca9e
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Apr 18 16:07:56 2024 +0200

    Switch CI release condition prefix to `release/3`
---
 .github/workflows/build.yaml       |  4 ++--
 .github/workflows/deploy-site.yaml | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 69532e45e1..7dd3ba7ab5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ on:
   push:
     branches:
       - "main"
-      - "release/*"
+      - "release/3*"
     paths-ignore:
       - "**.adoc"
       - "**.md"
@@ -53,7 +53,7 @@ jobs:
 
   deploy-release:
     needs: build
-    if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/')
+    if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/3')
     uses: apache/logging-parent/.github/workflows/deploy-release-reusable.yaml@rel/11.0.0
     # Secrets for deployments
     secrets:
diff --git a/.github/workflows/deploy-site.yaml b/.github/workflows/deploy-site.yaml
index c50b3e63c1..e8bd60be50 100644
--- a/.github/workflows/deploy-site.yaml
+++ b/.github/workflows/deploy-site.yaml
@@ -22,6 +22,7 @@ on:
     branches:
       - "main"
       - "main-site-pro"
+      - "release/3*"
     paths-ignore:
       - "**.md"
       - "**.txt"
@@ -49,7 +50,7 @@ jobs:
       target-branch: ${{ github.ref_name }}-site-stg-out
 
   deploy-site-pro:
-    if: github.repository == 'apache/logging-log4j2' && github.ref_name == '3.x-site-pro'
+    if: github.repository == 'apache/logging-log4j2' && github.ref_name == 'main-site-pro'
     uses: apache/logging-parent/.github/workflows/deploy-site-reusable.yaml@rel/11.0.0
     # Secrets for committing the generated site
     secrets:
@@ -65,3 +66,33 @@ jobs:
           subdir: content/log4j/3.x
       install-required: true
       target-branch: ${{ github.ref_name }}-out
+
+  export-version:
+    if: github.repository == 'apache/logging-log4j2' && startsWith(github.ref_name, 'release/3')
+    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@rel/11.0.0
+    # 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/log4j/${{ needs.export-version.outputs.version }}
+      install-required: true
+      target-branch: ${{ github.ref_name }}-site-stg-out