You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/10/18 18:45:14 UTC
[logging-parent] branch release/10.2.0 updated (203f15b -> 13ee5ca)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch release/10.2.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
from 203f15b Release changelog for version `10.2.0`
new d980925 Add concurrency limit
new 13ee5ca Add --force to the release pushes performed by the CI
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/build.yaml | 6 ++++++
.github/workflows/deploy-release-reusable.yaml | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
[logging-parent] 02/02: Add --force to the release pushes performed by the CI
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release/10.2.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit 13ee5ca880ef515b69fb1fc6b5fe2e1807e48be6
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Oct 18 20:42:11 2023 +0200
Add --force to the release pushes performed by the CI
If the `deploy` step fails, the Github Actions run will be two commits
behind the tip of the branch. We must allow the workflow to remove the
last two (automatic) commits from the branch.
Repos should use a `concurrency` setting to prevent Github Actions from
removing manually added commits.
---
.github/workflows/deploy-release-reusable.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml
index f8f24d7..d7f2060 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -111,7 +111,7 @@ jobs:
git config user.name "ASF Logging Services RM"
git config user.email private@logging.apache.org
git commit -S pom.xml -m "Set version to \`$PROJECT_VERSION\`"
- git push origin
+ git push -f origin
fi
- name: Release changelog
@@ -128,7 +128,7 @@ jobs:
git config user.name "ASF Logging Services RM"
git config user.email private@logging.apache.org
git commit -S src -m "Release changelog for version \`$PROJECT_VERSION\`"
- git push origin
+ git push -f origin
fi
- name: Build the website
[logging-parent] 01/02: Add concurrency limit
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release/10.2.0
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
commit d9809253c3be1a548ca1e54a5e9a1b5d05748be6
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Wed Oct 18 20:41:19 2023 +0200
Add concurrency limit
---
.github/workflows/build.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a8c6ef2..eab8e28 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -32,6 +32,12 @@ on:
- "**.md"
- "**.txt"
+# If the branch is 'main' run once per commit.
+# If the branch is 'release/*' allow only one concurrent run.
+concurrency:
+ group: ${{ github.ref_name == 'main' && github.ref || github.ref_name }}
+ cancel-in-progress: true
+
permissions: read-all
jobs: