Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enforce determinism in ArDoCo by architecture tests #260

Merged
merged 20 commits into from
Aug 22, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ ij_java_for_statement_wrap = off
ij_java_generate_final_locals = false
ij_java_generate_final_parameters = false
ij_java_if_brace_force = never
ij_java_imports_layout = $*,|,java.**,javax.**,|,org.**,com.**,|,*
ij_java_imports_layout = $*, |, java.**, javax.**, |, org.**, com.**, |, *
ij_java_indent_case_from_switch = false
ij_java_insert_inner_class_imports = false
ij_java_insert_override_annotation = true
Expand Down Expand Up @@ -155,7 +155,7 @@ ij_java_names_count_to_use_import_on_demand = 3
ij_java_new_line_after_lparen_in_annotation = false
ij_java_new_line_after_lparen_in_deconstruction_pattern = true
ij_java_new_line_after_lparen_in_record_header = false
ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
ij_java_parameter_annotation_wrap = off
ij_java_parentheses_expression_new_line_after_left_paren = false
ij_java_parentheses_expression_right_paren_on_new_line = false
Expand Down
17 changes: 10 additions & 7 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,15 +25,17 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
60 changes: 30 additions & 30 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
- package-ecosystem: "pip"
directory: "/docs/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
- package-ecosystem: "pip"
directory: "/docs/"
schedule:
interval: "weekly"
day: "wednesday"
time: "11:00"
timezone: "Europe/Berlin"
commit-message:
prefix: "Dependency"
include: "scope"
22 changes: 11 additions & 11 deletions .github/workflows/dependency-update.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
name: Maven Dependency Updates

on:
schedule:
- cron: "00 09 * * 2"
schedule:
- cron: "00 09 * * 2"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
update:
uses: ardoco/actions/.github/workflows/maven-update.yml@main
with:
with-submodules: true
runs-on: self-hosted
secrets:
PAT: ${{ secrets.SDQ_TOKEN }}
update:
uses: ardoco/actions/.github/workflows/maven-update.yml@main
with:
with-submodules: true
runs-on: self-hosted
secrets:
PAT: ${{ secrets.SDQ_TOKEN }}
44 changes: 22 additions & 22 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
name: Maven Deploy

on:
push:
branches:
- 'main' # Build the latest develop-SNAPSHOT
paths:
- '**/src/**'
- '**/pom.xml'
- 'pom.xml'

# Publish `v1.2.3` tags as releases.
tags:
- v*
push:
branches:
- 'main' # Build the latest develop-SNAPSHOT
paths:
- '**/src/**'
- '**/pom.xml'
- 'pom.xml'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Publish `v1.2.3` tags as releases.
tags:
- v*

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
publish:
uses: ardoco/actions/.github/workflows/maven.yml@main
with:
deploy: true
with-submodules: true
secrets:
OSSRH_USER: ${{secrets.OSSRH_USER}}
OSSRH_TOKEN: ${{secrets.OSSRH_TOKEN}}
GPG_KEY: ${{secrets.GPG_KEY}}
publish:
uses: ardoco/actions/.github/workflows/maven.yml@main
with:
deploy: true
with-submodules: true
secrets:
OSSRH_USER: ${{secrets.OSSRH_USER}}
OSSRH_TOKEN: ${{secrets.OSSRH_TOKEN}}
GPG_KEY: ${{secrets.GPG_KEY}}

62 changes: 31 additions & 31 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
name: Documentation

on:
push:
branches:
- main
tags: "v**"
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
workflow_dispatch:
push:
branches:
- main
tags: "v**"
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
workflow_dispatch:

jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.2
with:
token: ${{ secrets.SDQ_TOKEN }}
- uses: actions/checkout@v3.5.2
with:
repository: ${{ github.repository }}.wiki
path: wiki
token: ${{ secrets.SDQ_TOKEN }}
- name: Remove contents in Wiki
working-directory: wiki
run: ls -A1 | grep -v '.git' | xargs rm -r
- name: Copy Wiki from Docs folder
run: cp -r ./docs/. ./wiki
- name: Deploy 🚀
uses: stefanzweifel/git-auto-commit-action@v4
with:
repository: wiki
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.2
with:
token: ${{ secrets.SDQ_TOKEN }}
- uses: actions/checkout@v3.5.2
with:
repository: ${{ github.repository }}.wiki
path: wiki
token: ${{ secrets.SDQ_TOKEN }}

- name: Remove contents in Wiki
working-directory: wiki
run: ls -A1 | grep -v '.git' | xargs rm -r

- name: Copy Wiki from Docs folder
run: cp -r ./docs/. ./wiki

- name: Deploy 🚀
uses: stefanzweifel/git-auto-commit-action@v4
with:
repository: wiki
50 changes: 25 additions & 25 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
name: Format

on:
pull_request:
branches: [ main ]
pull_request:
branches: [ main ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
format:
runs-on: ubuntu-latest
format:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
- uses: joshlong/java-version-export-github-action@v28
id: jve
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ steps.jve.outputs.java_major_version }}
cache: 'maven'
- name: Format with Spotless in Maven
run: mvn -B spotless:apply --file pom.xml
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply formatting changes
steps:
- uses: actions/checkout@v3
with:
submodules: true
fetch-depth: 0
- uses: joshlong/java-version-export-github-action@v28
id: jve
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ steps.jve.outputs.java_major_version }}
cache: 'maven'
- name: Format with Spotless in Maven
run: mvn -B spotless:apply --file pom.xml
- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply formatting changes
38 changes: 19 additions & 19 deletions .github/workflows/maven-manual-release.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
name: Maven Release (Manual)

on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
release-version:
type: string
description: The version for release. E.g., "1.2.3"
required: true
next-version:
type: string
description: The version after release. E.g., "2.0.0-SNAPSHOT"
required: true
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
release-version:
type: string
description: The version for release. E.g., "1.2.3"
required: true
next-version:
type: string
description: The version after release. E.g., "2.0.0-SNAPSHOT"
required: true
jobs:
release:
uses: ardoco/actions/.github/workflows/maven-manual-release.yml@main
secrets:
# Needs to be a personal access token to push as a certain user; otherwise actions won't be triggered.
PAT: ${{ secrets.SDQ_TOKEN }}
with:
release-version: ${{ github.event.inputs.release-version }}
next-version: ${{ github.event.inputs.next-version }}
release:
uses: ardoco/actions/.github/workflows/maven-manual-release.yml@main
secrets:
# Needs to be a personal access token to push as a certain user; otherwise actions won't be triggered.
PAT: ${{ secrets.SDQ_TOKEN }}
with:
release-version: ${{ github.event.inputs.release-version }}
next-version: ${{ github.event.inputs.next-version }}
18 changes: 9 additions & 9 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Maven Release

on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
update:
uses: ardoco/actions/.github/workflows/maven-release.yml@main
with:
with-submodules: true
secrets:
# Needs to be a personal access token to push as a certain user; otherwise actions won't be triggered.
PAT: ${{ secrets.SDQ_TOKEN }}
update:
uses: ardoco/actions/.github/workflows/maven-release.yml@main
with:
with-submodules: true
secrets:
# Needs to be a personal access token to push as a certain user; otherwise actions won't be triggered.
PAT: ${{ secrets.SDQ_TOKEN }}
Loading