From 6493990175528ab441da6b81aaf34d219a7813de Mon Sep 17 00:00:00 2001 From: ariwk Date: Wed, 12 Jun 2024 08:28:23 +0200 Subject: [PATCH] ci: update workflows and configurations with repo template --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +- .github/ISSUE_TEMPLATE/feature_request.yml | 6 +- .github/workflows/maven-release.yml | 32 +---- .github/workflows/release-please.yml | 2 +- .pre-commit-config.yaml | 11 +- .yamlfix => .yamlfix.toml | 2 +- CODE_OF_CONDUCT.md | 133 --------------------- renovate.json | 17 +-- 8 files changed, 15 insertions(+), 194 deletions(-) rename .yamlfix => .yamlfix.toml (76%) delete mode 100644 CODE_OF_CONDUCT.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9b9f7d1..0a9e135 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -45,14 +45,12 @@ body: - type: input attributes: label: Extension Version - description: It can be found under https://<>/polarion/#/project/dev/administration/<>/About + description: It can be found under https://<>/polarion/#/project/dev/administration/<>/About validations: required: true - type: textarea attributes: label: Anything else - description: Further hints, links, or references? Any additional information - probably helping in root cause analysis. + description: Further hints, links, or references? Any additional information probably helping in root cause analysis. validations: required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 36b5370..216f9c3 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -17,10 +17,8 @@ body: - type: textarea attributes: label: Motivation - description: Describe additional context such as examples or use cases helping - in understanding the feature request. - placeholder: 'This feature would be helpful because ... so that the following - use case is addressed: ...' + description: Describe additional context such as examples or use cases helping in understanding the feature request. + placeholder: 'This feature would be helpful because ... so that the following use case is addressed: ...' validations: required: true - type: textarea diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index 8145679..96df30c 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -2,7 +2,7 @@ name: maven-release on: push: - branches: [main, feature/**, renovate/**] + branches: ['**/**'] jobs: build: runs-on: ubuntu-latest @@ -51,35 +51,16 @@ jobs: "id": "github", "username": "${env.GITHUB_ACTOR}", "password": "${env.GITHUB_TOKEN}" - }, - { - "id": "repsy", - "username": "${{ secrets.CH_SBB_POLARION_REPSY_USERNAME }}", - "password": "${{ secrets.CH_SBB_POLARION_REPSY_PASSWORD }}" } ] profiles: > [ - { - "id": "s3Deploy", - "properties": - { - "altDeploymentRepository": "s3::default::s3://sbb-polarion-maven-repo/polarion.mvn" - } - }, { "id": "githubDeploy", "properties": { "altDeploymentRepository": "github::default::https://maven.pkg.github.com/SchweizerischeBundesbahnen/ch.sbb.polarion.extension.interceptor" } - }, - { - "id": "repsyDeploy", - "properties": - { - "altDeploymentRepository": "repsy::default::https://repo.repsy.io/mvn/sbb/polarion" - } } ] - name: Print settings.xml @@ -88,16 +69,9 @@ jobs: run: mvn --batch-mode clean package - name: Extract artefact version id: artefact_version - run: echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" - >> $GITHUB_OUTPUT - - name: Publish to S3 bucket - if: ${{ !endsWith(steps.artefact_version.outputs.version, '-SNAPSHOT') }} - run: mvn --batch-mode deploy -Ps3Deploy - - name: Publish to repsy.io - if: ${{ !endsWith(steps.artefact_version.outputs.version, '-SNAPSHOT') }} - run: mvn --batch-mode deploy -PrepsyDeploy + run: echo "version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT - name: Publish to GitHub Packages - if: ${{ !endsWith(steps.artefact_version.outputs.version, '-SNAPSHOT') }} + if: ${{ !endsWith(steps.artefact_version.outputs.version, '-SNAPSHOT') && github.ref == 'refs/heads/main' }} run: mvn --batch-mode deploy -PgithubDeploy env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 3bdb4fa..07c92c2 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -15,4 +15,4 @@ jobs: uses: googleapis/release-please-action@v4 with: release-type: maven - default-branch: main + target-branch: main diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index aa74040..6c634be 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,23 +2,22 @@ default_install_hook_types: [pre-commit, commit-msg] repos: - repo: https://github.com/lyz-code/yamlfix - rev: 1.13.0 + rev: 1.16.0 hooks: - id: yamlfix - args: [-c .yamlfix] + args: [-c, .yamlfix.toml] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: check-merge-conflict - id: trailing-whitespace - id: check-xml - id: check-json - id: check-yaml - - id: detect-private-key - id: no-commit-to-branch - id: mixed-line-ending - repo: https://github.com/zricethezav/gitleaks - rev: v8.18.0 + rev: v8.18.3 hooks: - id: gitleaks - repo: https://github.com/grigoriev/pre-commit-check-git-user @@ -27,6 +26,6 @@ repos: - id: check-git-config-user-email args: [--templates, ^\S+\.\S+@sbb\.ch$] - repo: https://github.com/commitizen-tools/commitizen - rev: v3.13.0 + rev: v3.27.0 hooks: - id: commitizen diff --git a/.yamlfix b/.yamlfix.toml similarity index 76% rename from .yamlfix rename to .yamlfix.toml index 685c363..4d8e209 100644 --- a/.yamlfix +++ b/.yamlfix.toml @@ -1,3 +1,3 @@ allow_duplicate_keys = false -line_length = 120 +line_length = 180 sequence_style = "flow_style" \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 45d257b..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,133 +0,0 @@ - -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, caste, color, religion, or sexual -identity and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the overall - community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or advances of - any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email address, - without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -[INSERT CONTACT METHOD]. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series of -actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or permanent -ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within the -community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.1, available at -[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. - -Community Impact Guidelines were inspired by -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. - -For answers to common questions about this code of conduct, see the FAQ at -[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at -[https://www.contributor-covenant.org/translations][translations]. - -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations diff --git a/renovate.json b/renovate.json index 332e0cd..959d019 100644 --- a/renovate.json +++ b/renovate.json @@ -1,21 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base", - ":prNotPending", - ":rebaseStalePrs", - ":semanticCommits" - ], - "branchConcurrentLimit": 1, - "packageRules": [ - { - "matchManagers": ["maven"], - "allowedVersions": "!/-jboss-|-redhat-|redhat-|-jenkins-|-patch-|-atlassian-|-NODEP$|-atlassian$|-jbossorg-|-SNAPSHOT$|-PFD-|-jbossas-|-does-not-exist|-tc$|-jahia1$/" - }, - { - "matchManagers": ["maven"], - "matchDepTypes": ["provided", "runtime"], - "enabled": false - } + "github>SchweizerischeBundesbahnen/casc-renovate-preset-polarion-java" ] }