Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/update-from-template' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AB-xdev committed Jun 12, 2024
2 parents 870922d + acd6b4a commit ca81b25
Show file tree
Hide file tree
Showing 9 changed files with 289 additions and 39 deletions.
File renamed without changes.
20 changes: 10 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
pull-requests: write

jobs:
check_code: # Validates the code
check-code:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -45,9 +45,9 @@ jobs:
exit 1
fi
prepare_release:
prepare-release:
runs-on: ubuntu-latest
needs: [check_code]
needs: [check-code]
outputs:
upload_url: ${{ steps.create_release.outputs.upload_url }}
steps:
Expand Down Expand Up @@ -93,8 +93,8 @@ jobs:
release_name: v${{ steps.version.outputs.release }}
commitish: master
body: |
## [Changelog](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
## [Changelog](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/${{ github.repository }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
## Installation
Add the following lines to your pom:
Expand All @@ -106,9 +106,9 @@ jobs:
</dependency>
```
publish_central: # Publish the code to central
publish-maven:
runs-on: ubuntu-latest
needs: [prepare_release]
needs: [prepare-release]
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:

publish-pages:
runs-on: ubuntu-latest
needs: [prepare_release]
needs: [prepare-release]
steps:
- uses: actions/checkout@v4

Expand All @@ -166,9 +166,9 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site

after_release:
after-release:
runs-on: ubuntu-latest
needs: [publish_central]
needs: [publish-maven]
steps:
- uses: actions/checkout@v4

Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,22 @@ env:
SONARCLOUD_HOST: https://sonarcloud.io

jobs:
sonar:
name: SonarCloud Scan
token-check:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}
if: ${{ !(github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')) }}
outputs:
hasToken: ${{ steps.check-token.outputs.has }}
steps:
- id: check-token
run: |
[ -z $SONAR_TOKEN ] && echo "has=false" || echo "has=true" >> "$GITHUB_OUTPUT"
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

sonar-scan:
runs-on: ubuntu-latest
needs: token-check
if: ${{ needs.token-check.outputs.hasToken }}
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}

jobs:
publish_central: # Publish the code to central
publish-maven:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit ca81b25

Please sign in to comment.