From 242e0bd10307dcd811b63ee3cc15653ef4346e98 Mon Sep 17 00:00:00 2001 From: ariwk Date: Sat, 25 May 2024 11:34:43 +0200 Subject: [PATCH] chore: adapt repo template to docker Refs: #3 --- .github/ISSUE_TEMPLATE/bug_report.yml | 34 ++------- .github/ISSUE_TEMPLATE/feature_request.yml | 21 +++--- .github/workflows/maven-release.yml | 82 ---------------------- .github/workflows/pr.yml | 16 ++--- .github/workflows/release-please.yml | 4 +- .idea/codeStyles/Project.xml | 11 --- .idea/codeStyles/codeStyleConfig.xml | 5 -- .mvn/extensions.xml | 7 -- CONTRIBUTING.md | 2 +- pom.xml | 53 -------------- src/main/resources/META-INF/MANIFEST.MF | 14 ---- 11 files changed, 22 insertions(+), 227 deletions(-) delete mode 100644 .github/workflows/maven-release.yml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .mvn/extensions.xml delete mode 100644 pom.xml delete mode 100644 src/main/resources/META-INF/MANIFEST.MF diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 196f6b3..89091ae 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,25 +7,22 @@ body: attributes: value: | Before requesting: search [existing issues](../../../../labels/bug). - - type: textarea attributes: label: Current Behavior - description: "Description of the current behavior." + description: Description of the current behavior. validations: required: true - - type: textarea attributes: label: Expected Behavior - description: "Description of the expected behavior." + description: Description of the expected behavior. validations: required: true - - type: textarea attributes: label: Steps To Reproduce - description: "Example steps to reproduce the behavior:" + description: 'Example steps to reproduce the behavior:' placeholder: | 1. In this environment... 2. With this config... @@ -33,31 +30,10 @@ body: 4. See error... validations: required: true - - - type: input - attributes: - label: Environment - OS - description: "Linux or Windows" - validations: - required: true - - - type: input - attributes: - label: Polarion version - description: "2310, 2404, etc..." - validations: - required: true - - - type: input - attributes: - label: Extension Version - 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 a9ac348..36b5370 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,26 +7,25 @@ body: attributes: value: | Before requesting: search [existing issues](../../../../labels/enhancement). - - type: textarea attributes: - label: "Description" - description: "Describe the feature you're requesting." - placeholder: "This feature adds functionality to ..." + label: Description + description: Describe the feature you're requesting. + placeholder: This feature adds functionality to ... validations: required: true - - 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: ..." + 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: ...' validations: required: true - - type: textarea attributes: - label: "Proposed Solution (optional)" - description: "Sketch an implementation idea, possibly considering multiple approaches." + label: Proposed Solution (optional) + description: Sketch an implementation idea, possibly considering multiple approaches. validations: required: false diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml deleted file mode 100644 index 5eb9871..0000000 --- a/.github/workflows/maven-release.yml +++ /dev/null @@ -1,82 +0,0 @@ ---- -name: maven-release -on: - push: - branches: [main, feature/**, renovate/**] -jobs: - build: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 17 for deploy to S3 bucket - uses: actions/setup-java@v4 - with: - distribution: adopt - java-version: 17 - cache: maven - - uses: whelk-io/maven-settings-xml-action@v22 - with: - repositories: > - [ - { - "id": "s3", - "name": "s3.sbb.polarion.maven.repo", - "url": "s3://sbb-polarion-maven-repo/polarion.mvn", - "releases": { - "enabled": "true", - "updatePolicy": "never" - } - }, - { - "id": "repsy", - "name": "repsy.io", - "url": "https://repo.repsy.io/mvn/sbb/polarion", - "releases": { - "enabled": "true", - "updatePolicy": "never" - } - } - ] - servers: > - [ - { - "id": "s3", - "username": "${{ secrets.S3_SBB_POLARION_MAVEN_REPO_RW_ACCESS_KEY }}", - "password": "${{ secrets.S3_SBB_POLARION_MAVEN_REPO_RW_SECRET_ACCESS_KEY }}" - }, - { - "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 }}" - } - ] - active_profiles: > - [ - "github" - ] - - name: Print settings.xml - run: cat /home/runner/.m2/settings.xml - - name: Build with Maven - run: mvn --batch-mode clean package - - name: Extract artefact version - id: artefact_version - run: echo ::set-output name=version::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - - 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 - - name: Publish to GitHub Packages - if: ${{ !endsWith(steps.artefact_version.outputs.version, '-SNAPSHOT') }} - run: mvn --batch-mode deploy -PgithubDeploy - env: - GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 4ead895..fe7df91 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,18 +1,10 @@ --- name: PR checks - on: pull_request: - types: - - opened - - edited - - synchronize - - reopened - - unlocked - + types: [opened, edited, synchronize, reopened, unlocked] permissions: contents: read - jobs: check-conventional-commit: name: Check commit messages @@ -20,12 +12,12 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: "${{ github.event.pull_request.head.ref }}" - repository: "${{ github.event.pull_request.head.repo.full_name }}" + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} fetch-depth: 0 - uses: actions/setup-python@v5 with: - cache: "pip" # caching pip dependencies + cache: pip # caching pip dependencies - run: pip install commitizen - name: Check commit messages run: cz check --rev-range origin/${GITHUB_BASE_REF}.. diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 438fd48..f379cc3 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -12,7 +12,7 @@ jobs: steps: - name: release-please id: release - uses: google-github-actions/release-please-action@v4 + uses: googleapis/release-please-action@v4 with: - release-type: maven + release-type: simple default-branch: main diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index b8c83cc..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml deleted file mode 100644 index 4d1f8b9..0000000 --- a/.mvn/extensions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - com.github.seahen - maven-s3-wagon - 1.3.3 - - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 581600d..fbeaf36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ Before you submit your Pull Request (PR) consider the following guidelines: Note: The optional commit `-a` command line option will automatically "add" and "rm" edited files. Note: The command line option `-S` generates a signed commit, which is required to make a contribution (See [Developer Certificate of Origin](./LICENSES/DCO.txt)) - + * Push your branch to GitHub: ```shell diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e318fb2..0000000 --- a/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - ch.sbb.polarion.extensions - ch.sbb.polarion.extension.generic.parent-pom - 2.0.0 - - - ch.sbb.polarion.extension.extension-name - 0.0.0-SNAPSHOT - jar - - - extension-name - ch.sbb.polarion.extension.extension_name - - ${maven-jar-plugin.Extension-Context} - - - - - ch.sbb.polarion.extensions - ch.sbb.polarion.extension.generic.app - ${project.parent.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - - org.apache.maven.plugins - maven-jar-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.jacoco - jacoco-maven-plugin - - - - diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e38ad38..0000000 --- a/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Support-Email: polarion-opensource@sbb.ch -Bundle-Name: Extension for Polarion ALM -Require-Bundle: com.polarion.portal.tomcat, - com.polarion.alm.ui, - com.polarion.platform.guice, - com.polarion.alm.tracker, - org.glassfish.jersey, - com.fasterxml.jackson, - com.fasterxml.jackson.jaxrs, - io.swagger, - org.apache.commons.logging, - slf4j.api, - org.springframework.spring-core, - org.springframework.spring-web