You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/01/31 10:37:33 UTC
[sling-aggregator] branch master updated: updated jenkins links for
badge generators
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-aggregator.git
The following commit(s) were added to refs/heads/master by this push:
new 1c2773a updated jenkins links for badge generators
1c2773a is described below
commit 1c2773a7bdc54bb781bbd04940ab3e9d8fd3f204
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Thu Jan 31 11:09:26 2019 +0100
updated jenkins links for badge generators
---
add-badges.sh | 48 +++++++++++++++++++++++-----------------
generate-aggregator-table.groovy | 14 ++++++------
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/add-badges.sh b/add-badges.sh
index f612a89..2a0d587 100755
--- a/add-badges.sh
+++ b/add-badges.sh
@@ -40,22 +40,30 @@ function update_badges () {
prepend
STATUS=""
- while IFS=, read -r ID STAT EOL
- do
- if [ "$ID" == "$REPO_NAME" ]; then
- echo "Found status entry $STAT for $ID..."
- STATUS="$STAT"
+ for module in `cat $SCRIPT_DIR/contrib-projects.txt`; do
+ if [[ $project == $REPO_NAME ]]; then
+ STATUS="contrib"
+ break
fi
- done < $SCRIPT_DIR/Sling-Repos.csv
+ done
+
+ if [[ -z $STATUS ]]; then
+ for module in `cat $SCRIPT_DIR/deprecated-projects.txt`; do
+ if [[ $project == $REPO_NAME ]]; then
+ STATUS="deprecated"
+ break
+ fi
+ done
+ fi
if [ ! -z $STATUS ]; then
- LINE=" [](https://github.com/apache/sling-aggregator/blob/master/docs/status/$STATUS.md)"
+ LINE=" [](https://github.com/apache/sling-aggregator/blob/master/docs/status/$STATUS.md)"
prepend
fi
- GROUP="$(xmllint --xpath "string(/manifest/project[@path=\"$REPO_NAME\"]/@groups)" ~/git/sling/aggregator/default.xml)"
+ GROUP="$(xmllint --xpath "string(/manifest/project[@path=\"$REPO_NAME\"]/@groups)" $SCRIPT_DIR/default.xml)"
if [ ! -z "$GROUP" ]; then
- echo "Found group $GROUP..."
+ echo "Found group $GROUP..."
LINE=" [](https://github.com/apache/sling-aggregator/blob/master/docs/groups/$GROUP.md)"
prepend
fi
@@ -78,40 +86,40 @@ function update_badges () {
echo "No Maven release found for $ARTIFACT_ID"
else
echo "Adding Maven release badge for $ARTIFACT_ID"
- LINE=" [](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.sling%22%20a%3A%22$ARTIFACT_ID%22)"
+ LINE=" [](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.sling%22%20a%3A%22$ARTIFACT_ID%22)"
prepend
fi
fi
- COVERAGE_CONTENTS=$(curl -L https://img.shields.io/jenkins/c/https/builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8.svg)
- if [[ $COVERAGE_CONTENTS = *"inaccessible"* || $COVERAGE_CONTENTS = *"invalid"* ]]; then
+ COVERAGE_CONTENTS=$(curl -L https://img.shields.io/jenkins/c/https/builds.apache.org/job/Sling/job/sling-$REPO_NAME/job/master.svg)
+ if [[ $COVERAGE_CONTENTS = *"job or coverage not found"* ]]; then
echo "No coverage reports found for $REPO_NAME"
else
echo "Adding coverage badge for $REPO_NAME"
- LINE=" [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8/)"
+ LINE=" [](https://builds.apache.org/job/Sling/job/sling-$REPO_NAME/job/master)"
prepend
fi
- TEST_CONTENTS=$(curl -L https://img.shields.io/jenkins/t/https/builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8.svg)
+ TEST_CONTENTS=$(curl -L https://img.shields.io/jenkins/t/https/builds.apache.org/job/Sling/job/sling-$REPO_NAME/job/master.svg)
if [[ $TEST_CONTENTS = *"inaccessible"* || $TEST_CONTENTS = *"invalid"* ]]; then
echo "No tests found for $REPO_NAME"
else
echo "Adding test badge for $REPO_NAME"
- LINE=" [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8/test_results_analyzer/)"
+ LINE=" [](https://builds.apache.org/job/Sling/job/sling-$REPO_NAME/job/master/test_results_analyzer/)"
prepend
fi
- BUILD_RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" https://builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8)
+ BUILD_RESPONSE=$(curl -s -o /dev/null -w "%{http_code}" https://builds.apache.org/job/Sling/job/sling-$REPO_NAME/)
if [ "$BUILD_RESPONSE" != "404" ]; then
echo "Adding build badge for $REPO_NAME"
- LINE=" [](https://builds.apache.org/view/S-Z/view/Sling/job/sling-$REPO_NAME-1.8)"
+ LINE=" [](https://builds.apache.org/job/Sling/job/sling-$REPO_NAME/job/master)"
prepend
else
echo "No build found for $REPO_NAME"
fi
echo "Adding logo for $REPO_NAME"
- LINE="[<img src=\"http://sling.apache.org/res/logos/sling.png\"/>](http://sling.apache.org)\n\n"
+ LINE="[<img src=\"https://sling.apache.org/res/logos/sling.png\"/>](https://sling.apache.org)\n\n"
prepend
grip -b > /dev/null 2>&1 & > /dev/null
@@ -140,7 +148,7 @@ function handle_repo () {
cd $REPO
if [ ! -e "README.md" ]; then
echo "No README.md found in $REPO"
- elif grep -q "http:\/\/sling\.apache\.org\/res\/logos\/sling\.png" "README.md"; then
+ elif egrep -q "https?:\/\/sling\.apache\.org\/res\/logos\/sling\.png" "README.md"; then
echo "Badge already present on $REPO, overwrite (Y/N)?"
read OVERWRITE
if [ "$OVERWRITE" == "Y" ]; then
@@ -177,4 +185,4 @@ else
REPO=$SLING_DIR/$PROJECT
handle_repo
fi
-printf "\n\nBadge Update Complete!"
\ No newline at end of file
+printf "\n\nBadge Update Complete!"
diff --git a/generate-aggregator-table.groovy b/generate-aggregator-table.groovy
index 277cbf8..c9c91f3 100644
--- a/generate-aggregator-table.groovy
+++ b/generate-aggregator-table.groovy
@@ -109,17 +109,17 @@ void addRepo(File repoFolder, Node manifest) {
void calculateBadges(Map project){
def badges = [];
- if(getStatus("https://builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8") != 404) {
+ if(getStatus("https://builds.apache.org/job/Sling/job/sling-"+project.folder+"/") != 404) {
println "Adding Build Status badge..."
- badges.push(" [![Build Status](https://builds.apache.org/buildStatus/icon?job=sling-"+project.folder+"-1.8)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8)")
+ badges.push(" [![Build Status](https://builds.apache.org/buildStatus/icon?job=Sling/sling-"+project.folder+"/master)](https://builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master)")
}
- if(responseValid("https://img.shields.io/jenkins/t/https/builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8.svg")){
+ if(responseValid("https://img.shields.io/jenkins/t/https/builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master.svg")){
println "Adding test badge..."
- badges.push(" [![Test Status](https://img.shields.io/jenkins/t/https/builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8.svg?longCache=true)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8/test_results_analyzer/)")
+ badges.push(" [![Test Status](https://img.shields.io/jenkins/t/https/builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master.svg?longCache=true)](https://builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master/test_results_analyzer/)")
}
- if(responseValid("https://img.shields.io/jenkins/c/https/builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8.svg")){
+ if(responseValid("https://img.shields.io/jenkins/c/https/builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master.svg")){
println "Adding coverage badge..."
- badges.push(" [![Coverage Status](https://img.shields.io/jenkins/c/https/builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8.svg?longCache=true)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-"+project.folder+"-1.8/)")
+ badges.push(" [![Coverage Status](https://img.shields.io/jenkins/c/https/builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master.svg?longCache=true)]((https://builds.apache.org/job/Sling/job/sling-"+project.folder+"/job/master/)")
}
if(getStatus("https://www.javadoc.io/badge/org.apache.sling/"+project.folder+".svg") != 404) {
println "Adding Build Status badge..."
@@ -209,4 +209,4 @@ void writeProject(Map project) {
statusFile << "\n" << projectStr
}
modulesFile << "\n" << projectStr
-}
\ No newline at end of file
+}