Skip to content

Commit

Permalink
[all] : update assembly readme
Browse files Browse the repository at this point in the history
  • Loading branch information
ollily committed Feb 10, 2024
1 parent 49a1959 commit 60e3913
Show file tree
Hide file tree
Showing 8 changed files with 187 additions and 131 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/assembly-readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: assembly-readme
on:
workflow_dispatch:
push:
paths:
- src/site/resources/project-readme.adoc
branches:
- master
- develop

jobs:
build:
strategy:
matrix:
os: [ubuntu-latest]
version: [17]
distribution: [adopt]
runs-on: ${{ matrix.os }}

steps:
- name: checkout
uses: actions/checkout@v4.1.1

- name: install asciidoctor-reducer
run: sudo gem install asciidoctor-reducer

- name: assembly readme.adoc
# to preserve preprocessor conditionals, add the --preserve-conditionals option
run: asciidoctor-reducer --preserve-conditionals -o readme.adoc src/site/resources/project-readme.adoc

- name: commit and push readme.adoc
uses: EndBug/add-and-commit@v9
with:
add: readme.adoc
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- master
- develop
paths-ignore:
- '.github/workflows/sonarcloud.yml'
- '.github/workflows/**'
- '.run/**'
- '.m2/**'
- '.repo/**'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- master
- develop
paths-ignore:
- '.github/workflows/maven.yml'
- '.github/workflows/**'
- '.run/**'
- '.m2/**'
- '.repo/**'
Expand Down
Binary file added src/site/resources/images/logos/logo-module.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/site/resources/images/logos/logo-oGlow.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
146 changes: 27 additions & 119 deletions src/site/resources/proj-common.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
:hide-uri-scheme:

// common settings - for all modules the same
:cmmn_shields_hp: https://img.shields.io
:cmmn_shields_badge_url: {cmmn_shields_hp}/badge
Expand All @@ -21,7 +19,7 @@
:cmmn_img_github_style: &{cmmn_github_ref}{cmmn_shields_img_style}
:cmmn_github_workflow_link: actions/workflows
:cmmn_badge_github_url: {cmmn_shields_hp}/github
:cmmn_badge_github_status_url: {cmmn_badge_github_url}/workflow/status
:cmmn_badge_github_status_url: {cmmn_badge_github_url}/actions/workflow/status
:cmmn_badge_github_issues_url: {cmmn_badge_github_url}/issues
:cmmn_badge_github_pulls_url: {cmmn_badge_github_url}/issues-pr

Expand Down Expand Up @@ -54,12 +52,15 @@

// codacy
:cmmn_codacy_hp: https://www.codacy.com
:cmmn_codacy_app: https://app.codacy.com
:cmmn_codacy_ref: logo=codacy
:cmmn_img_codacy_style: &{cmmn_codacy_ref}{cmmn_shields_img_style}
:cmmn_badge_codacy_grade_url: {cmmn_shields_hp}/codacy/grade
:cmmn_badge_codacy_cov_url: {cmmn_shields_hp}/codacy/coverage
:cmmn_codacy_dash_gl_url: {cmmn_codacy_hp}/gl
:cmmn_codacy_dash_gh_url: {cmmn_codacy_hp}/gh
:cmmn_codacy_badge_grade_url: {cmmn_codacy_app}/project/badge/Grade
:cmmn_codacy_badge_cov_url: {cmmn_codacy_app}/project/badge/Coverage
:cmmn_codacy_dash_gl_url: {cmmn_codacy_app}/gl
:cmmn_codacy_dash_gh_url: {cmmn_codacy_app}/gh

// coverity
:cmmn_coverity_hp: https://scan.coverity.com
Expand Down Expand Up @@ -110,8 +111,10 @@ endif::[]
:proj_qi_codacy_brnch1_status_link: {cmmn_notsupp_link}
:proj_qi_codacy_brnch2_status_link: {cmmn_notsupp_link}
ifeval::["{proj_id_codacy}" != "-1"]
:proj_qi_codacy_brnch1_status_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}[image:{cmmn_badge_codacy_grade_url}/{proj_id_codacy}/{brnch_1}?{cmmn_img_codacy_style}[title="Codacy Scan Status"]]
:proj_qi_codacy_brnch2_status_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}[image:{cmmn_badge_codacy_grade_url}/{proj_id_codacy}/{brnch_2}?{cmmn_img_codacy_style}[title="Codacy Scan Status"]]
:proj_qi_codacy_brnch1_status_img: {cmmn_badge_codacy_grade_url}/{proj_id_codacy}/{brnch_1}?{cmmn_img_codacy_style}[title="Codacy Scan Status {brnch_1}"]
:proj_qi_codacy_brnch2_status_img: {cmmn_badge_codacy_grade_url}/{proj_id_codacy}/{brnch_2}?{cmmn_img_codacy_style}[title="Codacy Scan Status {brnch_2}"]
:proj_qi_codacy_brnch1_status_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}/dashboard?branch={brnch_1}[image:{proj_qi_codacy_brnch1_status_img}]
:proj_qi_codacy_brnch2_status_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}/dashboard?branch={brnch_2}[image:{proj_qi_codacy_brnch2_status_img}]
endif::[]

// qa openssf
Expand All @@ -121,129 +124,34 @@ ifeval::["{proj_id_openssf}" != "-1"]
endif::[]

// build status
:proj_bs_brnch1_link: {proj_github_wflow_url}/maven.yml?query=branch%3A{brnch_1}[image:{cmmn_badge_github_status_url}/{proj_vcsid}/maven-build/{brnch_1}?label={brnch_1}{cmmn_img_github_style}[title="Pipeline status on {brnch_1} branch"]]
:proj_bs_brnch2_link: {proj_github_wflow_url}/maven.yml?query=branch%3A{brnch_2}[image:{cmmn_badge_github_status_url}/{proj_vcsid}/maven-build/{brnch_2}?label={brnch_2}{cmmn_img_github_style}[title="Pipeline status on {brnch_2} branch"]]
:proj_bs_brnch1_img: {cmmn_badge_github_status_url}/{proj_vcsid}/maven.yml?branch={brnch_1}&label={brnch_1}{cmmn_img_github_style}[title="Pipeline status on {brnch_1} branch"]
:proj_bs_brnch2_img: {cmmn_badge_github_status_url}/{proj_vcsid}/maven.yml?branch={brnch_2}&label={brnch_2}{cmmn_img_github_style}[title="Pipeline status on {brnch_2} branch"]
:proj_bs_brnch1_link: {proj_github_wflow_url}/maven.yml?query=branch%3A{brnch_1}[image:{proj_bs_brnch1_img}]
:proj_bs_brnch2_link: {proj_github_wflow_url}/maven.yml?query=branch%3A{brnch_2}[image:{proj_bs_brnch2_img}]

// test information
// ti sonarqube
:proj_ti_sonar_brnch1_tsd_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/test_success_density/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Test Status"]]
:proj_ti_sonar_brnch2_tsd_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/test_success_density/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Test Status"]]
:proj_ti_sonar_brnch1_test_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/tests/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Test Count"]]
:proj_ti_sonar_brnch2_test_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/tests/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Test Count"]]
:proj_ti_sonar_brnch1_coverage_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/coverage/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Overall Coverage"]]
:proj_ti_sonar_brnch2_coverage_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/coverage/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Overall Coverage"]]
:proj_ti_sonar_brnch1_violations_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/violations/{proj_sonarid}/{brnch_1}?format=long{cmmn_img_sonar_style}[title="Violations"]]
:proj_ti_sonar_brnch2_violations_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/violations/{proj_sonarid}/{brnch_2}?format=long{cmmn_img_sonar_style}[title="Violations"]]
:proj_ti_sonar_brnch1_tsd_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/test_success_density/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Test Status {brnch_1}"]]
:proj_ti_sonar_brnch2_tsd_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/test_success_density/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Test Status {brnch_2}"]]
:proj_ti_sonar_brnch1_test_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/tests/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Test Count {brnch_1}"]]
:proj_ti_sonar_brnch2_test_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/tests/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Test Count {brnch_2}"]]
:proj_ti_sonar_brnch1_coverage_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/coverage/{proj_sonarid}/{brnch_1}?{cmmn_img_sonar_style}[title="Overall Coverage {brnch_1}"]]
:proj_ti_sonar_brnch2_coverage_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/coverage/{proj_sonarid}/{brnch_2}?{cmmn_img_sonar_style}[title="Overall Coverage {brnch_2}"]]
:proj_ti_sonar_brnch1_violations_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/violations/{proj_sonarid}/{brnch_1}?format=long{cmmn_img_sonar_style}[title="Violations {brnch_1}"]]
:proj_ti_sonar_brnch2_violations_link: {cmmn_sonar_dash_url}?id={proj_sonarid}[image:{cmmn_badge_sonar_url}/violations/{proj_sonarid}/{brnch_2}?format=long{cmmn_img_sonar_style}[title="Violations {brnch_2}"]]

// ti coveralls
:proj_ti_coveralls_brnch1_link: {cmmn_notsupp_link}
:proj_ti_coveralls_brnch2_link: {cmmn_notsupp_link}
ifeval::["{proj_id_coveralls}" != "-1"]
:proj_ti_coveralls_brnch1_link: {cmmn_coveralls_dash_gh_url}/{proj_id_coveralls}?branch={brnch_1}[image:{cmmn_badge_coveralls_url}/{proj_id_coveralls}/{brnch_1}?{cmmn_img_coveralls_style}[title="Coveralls Status"]]
:proj_ti_coveralls_brnch2_link: {cmmn_coveralls_dash_gh_url}/{proj_id_coveralls}?branch={brnch_2}[image:{cmmn_badge_coveralls_url}/{proj_id_coveralls}/{brnch_2}?{cmmn_img_coveralls_style}[title="Coveralls Status"]]
:proj_ti_coveralls_brnch1_link: {cmmn_coveralls_dash_gh_url}/{proj_id_coveralls}?branch={brnch_1}[image:{cmmn_badge_coveralls_url}/{proj_id_coveralls}/{brnch_1}?{cmmn_img_coveralls_style}[title="Coveralls Status {brnch_1}"]]
:proj_ti_coveralls_brnch2_link: {cmmn_coveralls_dash_gh_url}/{proj_id_coveralls}?branch={brnch_2}[image:{cmmn_badge_coveralls_url}/{proj_id_coveralls}/{brnch_2}?{cmmn_img_coveralls_style}[title="Coveralls Status {brnch_2}"]]
endif::[]

// ti codacy
:proj_ti_codacy_brnch1_link: {cmmn_notsupp_link}
:proj_ti_codacy_brnch2_link: {cmmn_notsupp_link}
ifeval::["{proj_id_codacy_cov}" != "-1"]
:proj_ti_codacy_brnch1_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}[image:{cmmn_badge_codacy_cov_url}/{proj_id_codacy}/{brnch_1}?{cmmn_img_codacy_style}[title="Codacy Coverage"]]
:proj_ti_codacy_brnch2_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}[image:{cmmn_badge_codacy_cov_url}/{proj_id_codacy}/{brnch_2}?{cmmn_img_codacy_style}[title="Codacy Coverage"]]
endif::[]

:source-highlighter: highlight.js

= {proj_module}
:toc: preamble
:toclevels: 2

link:{proj_ps_github_latest_link}
link:{proj_ps_github_license_link}
link:{proj_ps_maven_latest_link} +
link:{proj_ps_issues_link}
link:{proj_ps_pulls_link}

{proj_description}. +
See link:{proj_user_url}[Homepage].

== Installation

=== Pre-Requirements

Install link:https://maven.apache.org/install.html[Maven].

=== Usage

To use, set in your `pom.xml`:

:dep_tag: dependency
ifeval::["{proj_mvn_type}" == "pom"]
:dep_tag: parent
endif::[]

.pom.xml
[source,html,subs="attributes"]
----
<{dep_tag}>
<groupId>{proj_group}</groupId>
<artifactId>{proj_module}</artifactId>
<version>{proj_version}</version>
</{dep_tag}>
----

== Instructions

The detailed instructions for this artifact are found link:readme-project.adoc[here].

== Project Status

[%autowidth,frame=ends,valign=top,halign=center]
|===
| ^|Branch '{brnch_1}' ^|Branch '{brnch_2}'

3+|*Build*
|github.com
|link:{proj_bs_brnch1_link}
|link:{proj_bs_brnch2_link}
3+|*Quality Information*
|link:{cmmn_sonar_hp}[sonarcloud.io]
2+^|link:{proj_qi_sonar_qg_link}
|link:{cmmn_openssf_hp}[openSSF BP]
2+^|link:{proj_qi_openssf_status_link}
|link:{cmmn_codacy_hp}[codacy.com]
|link:{proj_qi_codacy_brnch1_status_link}
|link:{proj_qi_codacy_brnch2_status_link}
|link:{cmmn_coverity_hp}[coverity.com]
2+^|link:{proj_qi_coverity_brnch1_status_link}
ifeval::["{proj_mvn_type}" != "pom"]
3+|*Test Information*
|link:{cmmn_sonar_hp}[sonarcloud.io]
|link:{proj_ti_sonar_brnch1_tsd_link} +
link:{proj_ti_sonar_brnch1_test_link} +
link:{proj_ti_sonar_brnch1_coverage_link}
|link:{proj_ti_sonar_brnch2_tsd_link} +
link:{proj_ti_sonar_brnch2_test_link} +
link:{proj_ti_sonar_brnch2_coverage_link}
|link:{cmmn_coveralls_hp}[coveralls.io]
|link:{proj_ti_coveralls_brnch1_link}
|link:{proj_ti_coveralls_brnch2_link}
|link:{cmmn_codacy_hp}[codacy.com]
|link:{proj_ti_codacy_brnch1_link}
|link:{proj_ti_codacy_brnch1_link}
ifeval::["{proj_id_codacy}" != "-1"]
:proj_ti_codacy_brnch1_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}/dashboard?branch={brnch_1}[image:{cmmn_codacy_badge_cov_url}/{proj_id_codacy}?branch={brnch_1}{cmmn_img_codacy_style}[title="Codacy Coverage {brnch_1}"]]
:proj_ti_codacy_brnch2_link: {cmmn_codacy_dash_gh_url}/{proj_vcsid}/dashboard?branch={brnch_2}[image:{cmmn_codacy_badge_cov_url}/{proj_id_codacy}?branch={brnch_2}{cmmn_img_codacy_style}[title="Codacy Coverage {brnch_2}"]]
endif::[]
|===

link:{proj_qi_sonar_status_link}

== Author

{proj_author_url} from {org_team_url} of {org_author_url}.

== License

This project is released under the link:{proj_vcsid_url}/LICENSE[Apache License Version 2.0].
Please see the link:{proj_vcsid_url}/LICENSE[license file] for more information.

''''

~{proj_cright_org}~
31 changes: 21 additions & 10 deletions src/site/resources/proj-env.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,33 @@
:proj_user_org: The-oGlow
:proj_author: Oliver Glowa
:proj_user_email: coding at glowa-net dot com
:proj_vcs_url: https://gitlab.com
:proj_vcs_url: https://github.com
:proj_author_url: {proj_vcs_url}/{proj_user}[{proj_author}]
:proj_year: 2022

// organization
:org_name: oGlow
:org_url: http://www.glowa-net.com
:org_email:
:org_user: The-oGlow
:org_author: The oGlow
:org_team_user: oteam
:org_team: The oTeam
:org_url: http://coding.glowa-net.com
:org_email: {proj_user_email}
:org_vcs_url: {proj_vcs_url}
:org_author_url: {org_vcs_url}/{org_user}[{org_author}]
:org_team_url: {org_vcs_url}/orgs/{org_user}/teams/{org_team_user}[{org_team}]

// module data
:proj_gitgroup: the-oglow
:proj_group: com.glowa-net.maven.example
:proj_gitgroup: {org_user}
:proj_group: com.glowa-net.maven.tools
:proj_module: pojotesting-example
:proj_version: [latest release]
:proj_mvn_type: jar
:proj_version: [latest version]
:proj_description: Examples, how to use the 'pojo-testing'.
:proj_year: 2020
:proj_id_gavid: -1
//{proj_group}/{proj_module}
:proj_id_codacy: 78850a2d930a46b2896331aa8e2d13fb
:proj_id_coverity: -1
:proj_id_openssf: 6559

:proj_id_openssf: -1
//6559
:proj_id_coveralls: -1
//{proj_gitgroup}/{proj_module}
103 changes: 103 additions & 0 deletions src/site/resources/project-readme.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
:hide-uri-scheme:
:doctype: book

:site_resource: .
include::{site_resource}/proj-env.adoc[opts=optional]
include::{site_resource}/proj-common.adoc[opts=optional]

:source-highlighter: highlight.js

= {proj_module}
:toc: preamble
:toclevels: 2

link:{proj_ps_github_latest_link}
link:{proj_ps_github_license_link}
link:{proj_ps_maven_latest_link} +
link:{proj_ps_issues_link}
link:{proj_ps_pulls_link}

{proj_description}. +
See link:{proj_user_url}[Homepage].

== Installation

=== Pre-Requirements

Install link:https://maven.apache.org/install.html[Maven].

=== Usage

To use, set in your `pom.xml`:

:dep_tag: dependency
ifeval::["{proj_mvn_type}" == "pom"]
:dep_tag: parent
endif::[]

.pom.xml
[source,html,subs="attributes"]
----
<{dep_tag}>
<groupId>{proj_group}</groupId>
<artifactId>{proj_module}</artifactId>
<version>{proj_version}</version>
</{dep_tag}>
----

== Instructions

The detailed instructions for this artifact are found link:readme-project.adoc[here].

== Project Status

[%autowidth,frame=ends,valign=top,halign=center]
|===
| ^|Branch '{brnch_1}' ^|Branch '{brnch_2}'

3+|*Build*
|github.com
|link:{proj_bs_brnch1_link}
|link:{proj_bs_brnch2_link}
3+|*Quality Information*
|link:{cmmn_sonar_hp}[sonarcloud.io]
2+^|link:{proj_qi_sonar_qg_link}
|link:{cmmn_openssf_hp}[openSSF BP]
2+^|link:{proj_qi_openssf_status_link}
|link:{cmmn_codacy_hp}[codacy.com]
|link:{proj_qi_codacy_brnch1_status_link}
|link:{proj_qi_codacy_brnch2_status_link}
|link:{cmmn_coverity_hp}[coverity.com]
2+^|link:{proj_qi_coverity_brnch1_status_link}
ifeval::["{proj_mvn_type}" != "pom"]
3+|*Test Information*
|link:{cmmn_sonar_hp}[sonarcloud.io]
|link:{proj_ti_sonar_brnch1_tsd_link} +
link:{proj_ti_sonar_brnch1_test_link} +
link:{proj_ti_sonar_brnch1_coverage_link}
|link:{proj_ti_sonar_brnch2_tsd_link} +
link:{proj_ti_sonar_brnch2_test_link} +
link:{proj_ti_sonar_brnch2_coverage_link}
|link:{cmmn_coveralls_hp}[coveralls.io]
|link:{proj_ti_coveralls_brnch1_link}
|link:{proj_ti_coveralls_brnch2_link}
|link:{cmmn_codacy_hp}[codacy.com]
|link:{proj_ti_codacy_brnch1_link}
|link:{proj_ti_codacy_brnch2_link}
endif::[]
|===

link:{proj_qi_sonar_status_link}

== Author

{proj_author_url} from {org_team_url} of {org_author_url}.

== License

This project is released under the link:{proj_vcsid_url}/LICENSE[Apache License Version 2.0].
Please see the link:{proj_vcsid_url}/LICENSE[license file] for more information.

''''

~{proj_cright_org}~

0 comments on commit 60e3913

Please sign in to comment.