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 2023/09/28 09:15:39 UTC

[logging-parent] branch release/10.1.0 updated (c174963 -> 2a18d20)

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

vy pushed a change to branch release/10.1.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git


    from c174963  Upload test and reproducibility results on failures in CI (#28)
     new 1f29123  Fix CI failures
     new 2a18d20  Fix CI changelog generation

The 2 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/deploy-release-reusable.yaml       | 20 +++-----------------
 src/site/_release-notes/_10.1.0.adoc                 |  1 +
 .../_release-notes/_10.x.x.adoc}                     |  7 +++----
 3 files changed, 7 insertions(+), 21 deletions(-)
 copy src/{changelog/.10.x.x/.release-notes.adoc.ftl => site/_release-notes/_10.x.x.adoc} (91%)


[logging-parent] 01/02: Fix CI failures

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1f29123d1863f070339fe94dcf8d2b367fd7d196
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Sep 28 11:12:59 2023 +0200

    Fix CI failures
---
 src/site/_release-notes/_10.1.0.adoc |  1 +
 src/site/_release-notes/_10.x.x.adoc | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/src/site/_release-notes/_10.1.0.adoc b/src/site/_release-notes/_10.1.0.adoc
index 784e82c..c17892b 100644
--- a/src/site/_release-notes/_10.1.0.adoc
+++ b/src/site/_release-notes/_10.1.0.adoc
@@ -52,6 +52,7 @@ In particular, we expect the absence of `module-info.java` files to avoid severa
 * Added `asciidoc` and `constants-tmpl-adoc` profiles to generate AsciiDoc-based websites from `src/site`
 * Added support to auto-generate changelog entries for `dependabot` updates
 * Added `bnd-maven-plugin` defaults to auto-generate both OSGi and JPMS descriptors
+* Added CI report uploading in case of test or reproducibility failures (https://github.com/apache/logging-parent/issues/28[28])
 * Started publishing https://logging.apache.org/logging-parent[the project website]
 
 ==== Changed
diff --git a/src/site/_release-notes/_10.x.x.adoc b/src/site/_release-notes/_10.x.x.adoc
new file mode 100644
index 0000000..8f67449
--- /dev/null
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -0,0 +1,42 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+////
+    ██     ██  █████  ██████  ███    ██ ██ ███    ██  ██████  ██
+    ██     ██ ██   ██ ██   ██ ████   ██ ██ ████   ██ ██       ██
+    ██  █  ██ ███████ ██████  ██ ██  ██ ██ ██ ██  ██ ██   ███ ██
+    ██ ███ ██ ██   ██ ██   ██ ██  ██ ██ ██ ██  ██ ██ ██    ██
+     ███ ███  ██   ██ ██   ██ ██   ████ ██ ██   ████  ██████  ██
+
+    IF THIS FILE DOESN'T HAVE A `.ftl` SUFFIX, IT IS AUTO-GENERATED, DO NOT EDIT IT!
+
+    Version-specific release notes (`7.8.0.adoc`, etc.) are generated from `src/changelog/*/.release-notes.adoc.ftl`.
+    Auto-generation happens during `generate-sources` phase of Maven.
+    Hence, you must always
+
+    1. Find and edit the associated `.release-notes.adoc.ftl`
+    2. Run `./mvnw generate-sources`
+    3. Commit both `.release-notes.adoc.ftl` and the generated `7.8.0.adoc`
+////
+
+[#release-notes-10-x-x]
+=== 10.x.x
+
+
+
+This minor release contains several small improvements.
+


[logging-parent] 02/02: Fix CI changelog generation

Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 2a18d204458d6c1454f83317df7a5c21a43470f0
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Thu Sep 28 11:15:50 2023 +0200

    Fix CI changelog generation
---
 .github/workflows/deploy-release-reusable.yaml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml
index a3e768b..1147e41 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -119,26 +119,12 @@ jobs:
         run: |
           ./mvnw \
             --non-recursive --batch-mode --errors --no-transfer-progress \
-            -P changelog-release
-          git add src/changelog
+            -P changelog-release process-sources
+          git add src
           if [ -n "$(git status --porcelain)" ]; then
             git config user.name "ASF Logging Services RM"
             git config user.email private@logging.apache.org
-            git commit -S src/changelog -m "Release changelog for version \`$PROJECT_VERSION\`"
-            git push origin
-          fi
-
-      - name: Commit generated sources
-        shell: bash
-        run: |
-          ./mvnw \
-            --non-recursive --batch-mode --errors --no-transfer-progress \
-            process-sources
-          git add src/site
-          if [ -n "$(git status --porcelain)" ]; then
-            git config user.name "ASF Logging Services RM"
-            git config user.email private@logging.apache.org
-            git commit -S src/site -m "Add auto-generated sources"
+            git commit -S src -m "Release changelog for version \`$PROJECT_VERSION\`"
             git push origin
           fi