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/10/31 09:57:50 UTC
(logging-site) branch asf-staging updated (6d7944af -> 7200fbb1)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-site.git
from 6d7944af Fix `pom.xml` parsing
new 309a92ed Add `log4j-jmx-gui` and `log4cxx` repositories (apache/logging-log4j2#1707)
new 7200fbb1 Add `stats-instant.txt` support (apache/logging-log4j2#1707)
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/update-stats.yaml | 57 +++++++++++++++++++++++++------------
1 file changed, 39 insertions(+), 18 deletions(-)
(logging-site) 01/02: Add `log4j-jmx-gui` and `log4cxx` repositories (apache/logging-log4j2#1707)
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-site.git
commit 309a92ed961a0fbf06e328799982e47533970448
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Oct 31 10:57:24 2023 +0100
Add `log4j-jmx-gui` and `log4cxx` repositories (apache/logging-log4j2#1707)
---
.github/workflows/update-stats.yaml | 51 +++++++++++++++++++++++++------------
1 file changed, 35 insertions(+), 16 deletions(-)
diff --git a/.github/workflows/update-stats.yaml b/.github/workflows/update-stats.yaml
index d20b526b..a8eb552e 100644
--- a/.github/workflows/update-stats.yaml
+++ b/.github/workflows/update-stats.yaml
@@ -39,12 +39,18 @@ jobs:
strategy:
matrix:
proj-spec:
+ - id: log4cxx
+ repo-name: apache/logging-log4cxx
+ repo-branch: master
+ packaging: cmake
- id: log4j-1
repo-name: apache/logging-log4j1
repo-branch: main
- id: log4j-2
repo-name: apache/logging-log4j2
repo-branch: 2.x
+ - id: log4j-jmx-gui
+ repo-name: apache/logging-log4j-jmx-gui
- id: log4j-kotlin
repo-name: apache/logging-log4j-kotlin
- id: log4j-scala
@@ -64,6 +70,7 @@ jobs:
PROJ_ID: ${{ matrix.proj-spec.id }}
REPO_NAME: ${{ matrix.proj-spec.repo-name }}
REPO_BRANCH: ${{ matrix.proj-spec.repo-branch || 'main' }}
+ PROJ_PACKAGING: ${{ matrix.proj-spec.packaging || 'maven' }}
steps:
@@ -78,22 +85,34 @@ jobs:
- name: Collect statistics
shell: bash
run: |
- find . -regextype posix-extended -name "pom.xml" -and -not -regex "(.*/)?target/.*" | while read pomXmlFilepath; do
-
- # Ignore the artifact, if it is skipped at deployment
- skipMatchCount=$(python -c "import xml.etree.ElementTree as ET; print(len(ET.parse('$pomXmlFilepath').findall('./{*}properties/{*}maven.deploy.skip')))")
- [ "$skipMatchCount" -gt 0 ] && continue
-
- # Extract the module name (i.e., `artifactId`)
- module=$(python -c "import xml.etree.ElementTree as ET; print(ET.parse('$pomXmlFilepath').findall('./{*}artifactId')[0].text)")
-
- # Dump statistics of the module folder
- moduleDir=$(dirname "$pomXmlFilepath")
- git log --pretty=tformat:"%as %ae" -- "$moduleDir" | while read instant author; do
- echo "$PROJ_ID,$module,$instant,$author"
- done >>"$DATA_FILEPATH"
-
- done
+ case $PROJ_PACKAGING in
+
+ maven)
+ find . -regextype posix-extended -name "pom.xml" -and -not -regex "(.*/)?target/.*" | while read pomXmlFilepath; do
+
+ # Ignore the artifact, if it is skipped at deployment
+ skipMatchCount=$(python -c "import xml.etree.ElementTree as ET; print(len(ET.parse('$pomXmlFilepath').findall('./{*}properties/{*}maven.deploy.skip')))")
+ [ "$skipMatchCount" -gt 0 ] && continue
+
+ # Extract the module name (i.e., `artifactId`)
+ module=$(python -c "import xml.etree.ElementTree as ET; print(ET.parse('$pomXmlFilepath').findall('./{*}artifactId')[0].text)")
+
+ # Dump statistics of the module folder
+ moduleDir=$(dirname "$pomXmlFilepath")
+ git log --pretty=tformat:"%as %ae" -- "$moduleDir" | while read instant author; do
+ echo "$PROJ_ID,$module,$instant,$author"
+ done >>"$DATA_FILEPATH"
+
+ done
+ ;;
+
+ *)
+ git log --pretty=tformat:"%as %ae" | while read instant author; do
+ echo "$PROJ_ID,*,$instant,$author"
+ done >"$DATA_FILEPATH"
+ ;;
+
+ esac
- name: Upload statistics
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
(logging-site) 02/02: Add `stats-instant.txt` support (apache/logging-log4j2#1707)
Posted by vy...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/logging-site.git
commit 7200fbb15822103861004c1f344c273e2d1ce14c
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Tue Oct 31 10:57:53 2023 +0100
Add `stats-instant.txt` support (apache/logging-log4j2#1707)
---
.github/workflows/update-stats.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/update-stats.yaml b/.github/workflows/update-stats.yaml
index a8eb552e..35810ccc 100644
--- a/.github/workflows/update-stats.yaml
+++ b/.github/workflows/update-stats.yaml
@@ -167,8 +167,10 @@ jobs:
shell: bash
run: |
( echo "project,module,instant,author"; find "$DOWNLOAD_DIR" -type f | xargs cat ) >"$DATA_FILEPATH"
- git add "$DATA_FILEPATH"
+ export DATA_INSTANT_FILEPATH="stats-instant.txt"
+ echo -n $(date --utc "+%Y-%m-%dT%H:%M:%SZ") >"$DATA_INSTANT_FILEPATH"
+ git add "$DATA_FILEPATH" "$DATA_INSTANT_FILEPATH"
if [ -n "$(git status --porcelain)" ]; then
- git commit -S "$DATA_FILEPATH" -m "Update \`$DATA_FILEPATH\`"
+ git commit -S "$DATA_FILEPATH" "$DATA_INSTANT_FILEPATH" -m "Update project activity data"
git push -f origin
fi