Skip to content

Commit 14ab6c1

Browse files
HejdaJakubHejdaJakub
committed
Merge branch 'master' into production
2 parents b2b97e4 + becd811 commit 14ab6c1

File tree

24 files changed

+16835
-10929
lines changed

24 files changed

+16835
-10929
lines changed

‎.commitlintrc.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"extends": [
3+
"@commitlint/config-conventional"
4+
],
5+
"helpUrl": "https://perunaai.atlassian.net/wiki/spaces/STRIBOG/pages/13467868/Semantic+versioning",
6+
"rules": {
7+
"scope-enum": [
8+
2,
9+
"always",
10+
[
11+
"core",
12+
"openapi",
13+
"cli",
14+
"gui",
15+
"engine",
16+
"registrar",
17+
"dispatcher",
18+
"mvn",
19+
"deps",
20+
"deps-dev"
21+
]
22+
]
23+
},
24+
"prompt": {
25+
"questions": {
26+
"scope": {
27+
"description": "Enter the name of the module affected (e.g. core)"
28+
},
29+
"isIssueAffected": {
30+
"description": "Are there any specifics for deployment (upgrade notes)?"
31+
},
32+
"issuesBody": {
33+
"description": "If there are deployment/upgrade notes, the commit requires a body. Please enter a longer description of the commit itself"
34+
},
35+
"issues": {
36+
"description": "Enter UPGRADE NOTE: description of what needs to be done"
37+
}
38+
}
39+
}
40+
}

‎.github/workflows/check.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Check
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
run-commitlint-on-pr:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v3
11+
with:
12+
fetch-depth: 0
13+
- name: Setup Node
14+
uses: actions/setup-node@v3
15+
with:
16+
node-version: lts/*
17+
- name: Install dependencies
18+
run: npm ci
19+
- name: Validate all commits from PR
20+
run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ nb-configuration.xml
7676
!.gitignore
7777
!.gitattributes
7878
!.travis.yml
79+
!.commitlintrc.json
7980
*~
8081

8182
# Window ignore #

‎.releaserc.json‎

Lines changed: 135 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,138 @@
11
{
2-
"branches": [
3-
"production",
4-
"+([0-9])?(.{+([0-9]),x}).x",
5-
{ "name": "alpha", "prerelease": true },
6-
{ "name": "beta", "prerelease": true }
7-
],
8-
"preset": "conventionalcommits",
9-
"plugins": [
10-
"@semantic-release/commit-analyzer",
11-
"@semantic-release/release-notes-generator",
12-
["@semantic-release/exec", {
13-
"prepareCmd": "./update-versions.sh ${nextRelease.version} && mvn -B clean install"
14-
}],
15-
["@semantic-release/git", {
16-
"assets": [["**/pom.xml", "!perun-openapi/target/generated-sources/openapi/pom.xml"], "perun-openapi/openapi.yml", "perun-cli/Perun/Agent.pm"],
17-
"message": "chore(release): ${nextRelease.version} \n\n${nextRelease.notes}"
18-
}],
19-
["@semantic-release/github", {
20-
"assets": [
21-
{"path": "perun-rpc/target/perun-rpc.war"},
22-
{"path": "perun-engine/target/perun-engine.jar"},
23-
{"path": "perun-ldapc/target/perun-ldapc.jar"},
24-
{"path": "perun-web-gui/target/perun-web-gui.war"},
25-
{"path": "perun-cli-java/target/perun-cli-java.jar"}
26-
]
27-
}]
28-
]
2+
"branches": [
3+
"production",
4+
"+([0-9])?(.{+([0-9]),x}).x",
5+
{
6+
"name": "alpha",
7+
"prerelease": true
8+
},
9+
{
10+
"name": "beta",
11+
"prerelease": true
12+
}
13+
],
14+
"preset": "conventionalcommits",
15+
"plugins": [
16+
"@semantic-release/commit-analyzer",
17+
[
18+
"@semantic-release/release-notes-generator",
19+
{
20+
"preset": "conventionalcommits",
21+
"presetConfig": {
22+
"types": [
23+
{
24+
"type": "feat",
25+
"section": "New features and notable changes",
26+
"hidden": false
27+
},
28+
{
29+
"type": "fix",
30+
"hidden": true
31+
},
32+
{
33+
"type": "perf",
34+
"hidden": true
35+
},
36+
{
37+
"type": "revert",
38+
"hidden": true
39+
},
40+
{
41+
"type": "docs",
42+
"hidden": true
43+
},
44+
{
45+
"type": "style",
46+
"hidden": true
47+
},
48+
{
49+
"type": "chore",
50+
"hidden": true
51+
},
52+
{
53+
"type": "refactor",
54+
"hidden": true
55+
},
56+
{
57+
"type": "test",
58+
"hidden": true
59+
},
60+
{
61+
"type": "build",
62+
"hidden": true
63+
},
64+
{
65+
"type": "ci",
66+
"hidden": true
67+
}
68+
],
69+
"issuePrefixes": [
70+
"ST"
71+
],
72+
"issueUrlFormat": "https://perunaai.atlassian.net/browse/{{prefix}}{{id}}"
73+
},
74+
"parserOpts": {
75+
"noteKeywords": [
76+
"BREAKING CHANGE",
77+
"BREAKING CHANGES",
78+
"DEPLOYMENT NOTE",
79+
"DEPLOYMENT NOTES",
80+
"UPGRADE NOTE",
81+
"UPGRADE NOTES"
82+
]
83+
}
84+
}
85+
],
86+
[
87+
"@semantic-release/exec",
88+
{
89+
"prepareCmd": "./update-versions.sh ${nextRelease.version} && mvn -B clean install"
90+
}
91+
],
92+
[
93+
"@semantic-release/git",
94+
{
95+
"assets": [
96+
[
97+
"**/pom.xml",
98+
"!perun-openapi/target/generated-sources/openapi/pom.xml"
99+
],
100+
"perun-openapi/openapi.yml",
101+
"perun-cli/Perun/Agent.pm",
102+
"UPGRADE.md"
103+
],
104+
"message": "chore(release): ${nextRelease.version} \n\n${nextRelease.notes}"
105+
}
106+
],
107+
[
108+
"@semantic-release/changelog",
109+
{
110+
"changelogFile": "UPGRADE.md",
111+
"changelogTitle": "Upgrade notes"
112+
}
113+
],
114+
[
115+
"@semantic-release/github",
116+
{
117+
"assets": [
118+
{
119+
"path": "perun-rpc/target/perun-rpc.war"
120+
},
121+
{
122+
"path": "perun-engine/target/perun-engine.jar"
123+
},
124+
{
125+
"path": "perun-ldapc/target/perun-ldapc.jar"
126+
},
127+
{
128+
"path": "perun-web-gui/target/perun-web-gui.war"
129+
},
130+
{
131+
"path": "perun-cli-java/target/perun-cli-java.jar"
132+
}
133+
]
134+
}
135+
]
136+
]
29137
}
30138

‎README.md‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,43 @@
1-
![](https://github.com/CESNET/perun/workflows/test%20build/badge.svg)
21

32
<a href="https://perun-aai.org"><img style="float: left; position: relative;" src="https://raw.githubusercontent.com/CESNET/perun/master/perun-web-gui/src/main/webapp/img/logo.png"></a>
4-
## Identity & Access Management System ##
3+
## Identity & Access Management System
4+
5+
[![conventional commits](https://img.shields.io/badge/semantic--release-conventional-e10079?logo=semantic-release)](https://www.conventionalcommits.org/)
6+
[![commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](https://commitizen.github.io/cz-cli/)
7+
[![CI status](https://github.com/CESNET/perun/workflows/test%20build/badge.svg)](https://github.com/cesnet/perun/actions/workflows/maven.yml)
8+
[![latest release](https://img.shields.io/github/v/release/cesnet/perun)](https://github.com/CESNET/perun/releases)
59

610
Perun is an identity and access management system primary targeting academia environment. Perun is well suited for managing users within organizations and projects and managing access rights to the services.
711

8-
### Features ###
12+
### Features
913

10-
* Simplify and automate all identity management related workflows
11-
* Perform access management by provisioning and de-provisioning users to your services
12-
* Support delegation of user/service management responsibilities
13-
* Unified GUI as a single place for managing everything from personal profile to groups and services settings
14-
* Organize users within groups and virtual organizations
15-
* Handle whole user lifecycle from registration to membership expiration / extension
16-
* Allow users to self register using invitations
17-
* Support import/export and synchronization between your existing user databases
18-
* Can handle and join multiple user identities a manage them across your services
19-
* All actions are audited
14+
- Simplify and automate all identity management related workflows
15+
- Perform access management by provisioning and de-provisioning users to your services
16+
- Support delegation of user/service management responsibilities
17+
- Unified GUI as a single place for managing everything from personal profile to groups and services settings
18+
- Organize users within groups and virtual organizations
19+
- Handle whole user lifecycle from registration to membership expiration / extension
20+
- Allow users to self register using invitations
21+
- Support import/export and synchronization between your existing user databases
22+
- Can handle and join multiple user identities a manage them across your services
23+
- All actions are audited
2024

21-
### Related projects ###
25+
### Related projects
2226

23-
* [Perun ansible](https://github.com/CESNET/perun-ansible) - Perun installation automation using Ansible
24-
* [Perun services](https://github.com/CESNET/perun-services) - connectors Perun uses to manage services
25-
* [Perun Web Apps](https://github.com/CESNET/perun-web-apps) - new web user interface for Perun using Angular
26-
* [Perun WUI](https://github.com/CESNET/perun-wui) - current web user interface for Perun
27-
* [Google Group connector](https://github.com/CESNET/google-group-connector) - allow provisioning of Google groups on your domain
27+
- [Perun ansible](https://github.com/CESNET/perun-ansible) - Perun installation automation using Ansible
28+
- [Perun services](https://github.com/CESNET/perun-services) - connectors Perun uses to manage services
29+
- [Perun Web Apps](https://github.com/CESNET/perun-web-apps) - new web user interface for Perun using Angular
30+
- [Perun WUI](https://github.com/CESNET/perun-wui) - current web user interface for Perun
31+
- [Google Group connector](https://github.com/CESNET/google-group-connector) - allow provisioning of Google groups on your domain
2832

29-
### License ###
33+
### License
3034

3135
&copy; 2010-2023 [CESNET](https://www.cesnet.cz/?lang=en), [CERIT-SC](https://www.cerit-sc.cz/en/index.html) and [Masaryk University](https://www.muni.cz/en), all rights reserved.
3236

3337
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
3438

35-
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
36-
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
39+
- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
40+
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
3741

3842
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
3943
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
@@ -49,6 +53,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
4953
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
5054
POSSIBILITY OF SUCH DAMAGE.
5155

52-
### Acknowledgement ###
56+
### Acknowledgement
5357

5458
This work is co-funded by the EOSC-hub project (Horizon 2020) under Grant number 777536.

0 commit comments

Comments
 (0)