Skip to content

Commit

Permalink
Merge branch 'main' into features/90_Build-with-Java-17
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/on_workflow_dispatch_perform_maven_release.yml
#	cdi-config-extension/pom.xml
#	pom.xml
  • Loading branch information
Riduidel committed Feb 19, 2024
2 parents f895e95 + bdcc819 commit 0c3ff1b
Show file tree
Hide file tree
Showing 76 changed files with 2,716 additions and 1,995 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/on_pull_request_push_run_test_and_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,13 @@ jobs:
env:
TOKEN_FOR_GITHUB: ${{ secrets.TOKEN_FOR_GITHUB }}
TOKEN_FOR_GITLAB: ${{ secrets.TOKEN_FOR_GITLAB }}
# Seen on https://stackoverflow.com/a/70405596/15619
- name: Add coverage to PR
id: jacoco
uses: madrapps/jacoco-report@v1.3
uses: madrapps/jacoco-report@v1.6.1
with:
paths: |
${{ github.workspace }}/architecture-documentation/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/markdown-to-asciidoc/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/maven-metadata-inferer/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/sequence-diagram-generator/target/site/jacoco/jacoco.xml
token: ${{ secrets.GITHUB_TOKEN }}
paths: "**/target/site/jacoco/jacoco.xml"
token: "${{ secrets.GITHUB_TOKEN }}"
min-coverage-overall: 10
min-coverage-changed-files: 50
title: Current coverage (as computed by Jacoco)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on_push_on_master_deploy_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
TOKEN_FOR_GITHUB: ${{ secrets.TOKEN_FOR_GITHUB }}
TOKEN_FOR_GITLAB: ${{ secrets.TOKEN_FOR_GITLAB }}
- name: Upload artifact
uses: actions/upload-pages-artifact@main
uses: actions/upload-pages-artifact@v3.0.1
with:
path: ./architecture-documentation/target/asciidoc/docs/html
retention-days: ${{ inputs.retention-days }}
Expand All @@ -51,4 +51,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
38 changes: 0 additions & 38 deletions .github/workflows/on_release_update_readme.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .github/workflows/on_tag_generate_release_notes.yml

This file was deleted.

19 changes: 15 additions & 4 deletions .github/workflows/on_workflow_dispatch_perform_maven_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
releaseversion:
description: 'Release version'
required: true
default: "0.1.11"
default: "0.1.14"

jobs:
build:
Expand All @@ -28,10 +28,12 @@ jobs:
fetch-depth: '0'
- name: Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6.1.0
with:
gpg_private_key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
- name: List gpg keys (there should be only one)
run: gpg -K
- name: Setup git configuration
run: |
git config --global user.email "aadarchi-releaser-bot@users.noreply.github.com"
Expand All @@ -46,7 +48,7 @@ jobs:
server-username: ${{ secrets.OSS_SONATYPE_USERNAME }}
server-password: ${{ secrets.OSS_SONATYPE_PASSWORD }}
- name: Do not forget to configure Maven Settings!
uses: s4u/maven-settings-action@v2.8.0
uses: s4u/maven-settings-action@v3.0.0
with:
override: true
githubServer: true
Expand All @@ -68,4 +70,13 @@ jobs:
- name: Build with Maven
run: mvn --no-transfer-progress -B release:prepare release:perform -Prelease --file pom.xml
env:
GITHUB_TOKEN: ${{ github.token }}
GITHUB_TOKEN: ${{ github.token }}
- name: Get created tag name (for GitHuub release creation)
id: tag
run: echo "CREATED_GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT
- name: Create associated GitHub release
uses: lakto/gren-action@v2.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
options: "--override --data-source=issues --prerelease --tags=${{ steps.tag.outputs.CREATED_GIT_TAG }}"
21 changes: 8 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
<h1 align="center">Welcome to Aadarchi 👋</h1>
<p>
<a href="https://github.com/Riduidel/aadarchi/actions?query=workflow%3A%22Java+CI+with+Maven%22">
<img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/Riduidel/aadarchi/on_push_on_master_deploy_build.yml?branch=main">
</a>
<a href="https://github.com/Riduidel/aadarchi/releases" target="_blank"><img src="https://badge.fury.io/gh/Riduidel%2Faadarchi.svg" alt="GitHub version"></a>
<img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/Riduidel/aadarchi">
<a href="https://twitter.com/Riduidel" target="_blank">
<img alt="Twitter: Riduidel" src="https://img.shields.io/twitter/follow/Riduidel.svg?style=social" />
</a>
</p>
# Welcome to Aadarchi 👋

[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/Riduidel/aadarchi/on_push_on_master_deploy_build.yml)](https://github.com/Riduidel/aadarchi/actions/workflows/on_push_on_master_deploy_build.yml)
[![GitHub version](https://badge.fury.io/gh/Riduidel%2Faadarchi.svg)](https://badge.fury.io/gh/Riduidel%2Faadarchi)
![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/Riduidel/aadarchi)
![Mastodon Follow](https://img.shields.io/mastodon/follow/000004227?domain=https%3A%2F%2Fframapiaf.org)

> A Maven archetype allowing you to easily create your agile architecture documentation using a mix of C4, Asciidoc and PlantUML. This archetype uses [Structurizr](https://github.com/structurizr/java/) to build the architecture model, and [Agile architecture documentation](https://web.archive.org/web/20210518020154/http://www.codingthearchitecture.com/2016/05/31/agile_software_architecture_documentation.html) template, all by Simon Brown.
Expand All @@ -18,7 +13,7 @@ You can use the archetype by running this maven-friendly 😅command.
Current version is ![GitHub version](https://badge.fury.io/gh/Riduidel%2Faadarchi.svg)

```sh
mvn archetype:generate -DarchetypeVersion=0.1.11 -Daadarchi-version=0.1.11 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype
mvn archetype:generate -DarchetypeVersion=0.1.14 -Daadarchi-version=0.1.14 -DarchetypeGroupId=io.github.Riduidel.aadarchi -DarchetypeArtifactId=archetype
```

This will ask you a few questions and generate the project.
Expand Down Expand Up @@ -94,7 +89,7 @@ Way more details are available in the [architecture documentation (which uses th

👤 **Nicolas Delsaux**

* Twitter: [@Riduidel](https://twitter.com/Riduidel)
* Mastodon: [@Riduidel](https://framapiaf.org/@Riduidel)
* Github: [@Riduidel](https://github.com/Riduidel)

## 🤝 Contributing
Expand Down
Loading

0 comments on commit 0c3ff1b

Please sign in to comment.