Skip to content

Commit b9dadef

Browse files
authored
Merge branch 'develop' into feature/options-clean-up
2 parents 260d5b0 + 1356f9f commit b9dadef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2130
-322
lines changed

.gitattributes

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/approve_dependabotifications.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/dependabot.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Handle Dependabot PRs
2+
3+
on:
4+
pull_request:
5+
types: [ opened, reopened, synchronize ]
6+
7+
permissions:
8+
contents: write
9+
pull-requests: write
10+
11+
jobs:
12+
ApproveAndMerge:
13+
name: Auto approve Dependabot PRs
14+
runs-on: ubuntu-latest
15+
# Only run for PRs created by Dependabot - extended verification is done in the reusable workflow
16+
if: github.actor == 'dependabot[bot]'
17+
# These permissions are needed to approve pull requests
18+
permissions:
19+
contents: read
20+
pull-requests: write
21+
steps:
22+
- name: Auto approve Dependabot PR
23+
uses: secure-software-engineering/actions/dependabot@develop
24+
with:
25+
token: ${{ secrets.AUTO_MERGE_PAT }}

.github/workflows/dependency_analysis.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/deploy-branch-snapshot.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/deploy-pr-preview.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Deploy SNAPSHOT versions
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
deploy-snapshot:
10+
runs-on: ubuntu-latest
11+
name: Deploy SNAPSHOT version
12+
environment: Deploy
13+
steps:
14+
- name: Checkout source code
15+
uses: actions/checkout@v4
16+
17+
- name: Deploy SNAPSHOT version
18+
uses: secure-software-engineering/actions/deployment/maven-deployment@develop
19+
with:
20+
java-distribution: adopt
21+
java-version: 11
22+
server-id: central
23+
server-username: ${{ secrets.MAVEN_USERNAME }}
24+
server-password: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
25+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
26+
gpg-passphrase: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
27+
mvn-cli-args: '-DskipTests -Dmaven.javadoc.skip=true -Pdeployment'
28+
deploy-mode: snapshot

.github/workflows/deploy.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,24 @@ env:
99
jobs:
1010
deployment:
1111
runs-on: ubuntu-latest
12+
name: Deploy to Maven
1213
environment: Deploy
1314
steps:
1415
- name: Checkout source code
1516
uses: actions/checkout@v4
16-
# Sets up Java version
17-
- name: Set up Java
18-
uses: actions/setup-java@v4
17+
18+
- name: Deploy version
19+
uses: secure-software-engineering/actions/deployment/maven-deployment@develop
1920
with:
20-
distribution: adopt
21-
java-package: jdk
21+
java-distribution: adopt
2222
java-version: 11
23-
server-id: ossrh # must match the serverId configured for the nexus-staging-maven-plugin
24-
server-username: OSSRH_USERNAME # Env var that holds your OSSRH user name
25-
server-password: OSSRH_PASSWORD # Env var that holds your OSSRH user pw
26-
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Substituted with the value stored in the referenced secret
27-
gpg-passphrase: SIGN_KEY_PASS # Env var that holds the key's passphrase
28-
- name: Deploy Boomerang
29-
run: mvn -B -U clean deploy -Pdeployment -DskipTests
30-
env:
31-
SIGN_KEY_PASS: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
32-
OSSRH_USERNAME: ${{ secrets.SONATYPE_USER }}
33-
OSSRH_PASSWORD: ${{ secrets.SONATYPE_PW }}
23+
server-id: central
24+
server-username: ${{ secrets.MAVEN_USERNAME }}
25+
server-password: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
26+
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
27+
gpg-passphrase: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
28+
mvn-cli-args: '-DskipTests -Pdeployment'
29+
deploy-mode: release
3430

3531
snapshot-version:
3632
runs-on: ubuntu-latest
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Documentation Deployment
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
tags:
8+
- '*'
9+
10+
concurrency:
11+
group: gh-pages
12+
13+
jobs:
14+
# On push/merge to develop: Deploy the current doc as default/latest
15+
deploy-doc-snapshots:
16+
name: Deploy Snapshot Documentation
17+
if: ${{ github.event_name == 'push' }}
18+
runs-on: ubuntu-latest
19+
permissions:
20+
contents: write
21+
22+
steps:
23+
- name: Checkout Repository
24+
uses: actions/checkout@v4
25+
with:
26+
fetch-depth: 0
27+
28+
- name: Extract Maven Version
29+
id: version
30+
run: |
31+
VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
32+
echo "version=$VERSION" >> $GITHUB_OUTPUT
33+
34+
- name: Deploy Snapshot Documentation
35+
uses: secure-software-engineering/actions/documentation/handle-deployment@develop
36+
with:
37+
name: ${{ steps.version.outputs.version }}
38+
title: ${{ steps.version.outputs.version }}
39+
40+
# On tag creation (i.e. new release): Deploy a stable version to directory with tag
41+
deploy-doc-stable:
42+
name: Deploy Stable Documentation
43+
if: startsWith(github.ref, 'refs/tags/')
44+
runs-on: ubuntu-latest
45+
permissions:
46+
contents: write
47+
48+
steps:
49+
- name: Checkout Repository
50+
uses: actions/checkout@v4
51+
with:
52+
ref: ${{ github.ref }}
53+
fetch-depth: 0
54+
55+
- name: Deploy Stable Documentation
56+
uses: secure-software-engineering/actions/documentation/handle-deployment@develop
57+
with:
58+
name: ${{ github.ref_name }}
59+
title: ${{ github.ref_name }}
60+
stable: true

.github/workflows/doc_preview.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Documentation Preview
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- closed
8+
- synchronize
9+
- reopened
10+
paths:
11+
- mkdocs.yml
12+
- docs/**
13+
- .github/workflows/doc_preview.yml
14+
15+
concurrency:
16+
group: gh-pages
17+
18+
jobs:
19+
deploy-preview:
20+
name: Preview documentation
21+
runs-on: ubuntu-latest
22+
permissions:
23+
contents: write
24+
pull-requests: write
25+
26+
steps:
27+
- name: Checkout Repository
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 0
31+
32+
- name: Create Documentation Preview
33+
uses: secure-software-engineering/actions/documentation/handle-pr-preview@develop
34+
with:
35+
preview-name: pr-${{ github.event.pull_request.number }}
36+
preview-title: Preview for PR-${{ github.event.pull_request.number }}

0 commit comments

Comments
 (0)