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

Update sonar 10.4 #4

Merged
merged 26 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b134ef4
Update 1.17.0
C4tWithShell Feb 8, 2024
d07b087
Update
C4tWithShell Feb 8, 2024
6e233a3
Update gradle
C4tWithShell Feb 8, 2024
d526737
[Gradle Release Plugin] - new version commit: '1.17.1'.
web-flow Feb 8, 2024
6fb4793
Update
C4tWithShell Feb 15, 2024
c33123d
[Gradle Release Plugin] - new version commit: '1.17.2'.
web-flow Feb 15, 2024
62a54b0
Update Jwts
C4tWithShell Feb 15, 2024
b296d3e
[Gradle Release Plugin] - new version commit: '1.17.3'.
web-flow Feb 15, 2024
58cbdd1
Update time
C4tWithShell Feb 15, 2024
d586b95
[Gradle Release Plugin] - new version commit: '1.17.4'.
web-flow Feb 15, 2024
c51e51c
Update jwts builder
C4tWithShell Feb 15, 2024
e94e5a8
[Gradle Release Plugin] - new version commit: '1.17.5'.
web-flow Feb 15, 2024
7b989e0
Add deps
C4tWithShell Feb 15, 2024
9b3841b
Merge branch 'update/17.0' of https://github.com/soramitsu/soramitsu-…
C4tWithShell Feb 15, 2024
f7bb4a4
[Gradle Release Plugin] - new version commit: '1.17.6'.
web-flow Feb 15, 2024
75510fc
Try with builder
C4tWithShell Feb 15, 2024
1916b9b
[Gradle Release Plugin] - new version commit: '1.17.7'.
web-flow Feb 15, 2024
2d005ff
Remove issuedAt
C4tWithShell Feb 15, 2024
34fc298
[Gradle Release Plugin] - new version commit: '1.17.8'.
web-flow Feb 15, 2024
b1ce483
Test
C4tWithShell Feb 15, 2024
d7eb2a1
Update 1.17.1
C4tWithShell Feb 15, 2024
ecf6d47
Update 1.17.1
C4tWithShell Feb 15, 2024
058ba89
Update 1.17.1
C4tWithShell Feb 15, 2024
67c6fb5
[Gradle Release Plugin] - new version commit: '1.17.2'.
web-flow Feb 15, 2024
08f2d79
Update
C4tWithShell Apr 8, 2024
e12b77e
[Gradle Release Plugin] - new version commit: '1.17.3'.
web-flow Apr 8, 2024
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ SONARQUBE_VERSION=latest
DOCKERFILE=Dockerfile

# The version of the plugin to include in the image
PLUGIN_VERSION=1.16.1-SNAPSHOT
PLUGIN_VERSION=1.17.0
38 changes: 18 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Init
id: init
Expand All @@ -45,10 +45,10 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
java-package: jdk
Expand All @@ -68,7 +68,7 @@ jobs:
-
name: Archive artifact
if: success() && matrix.java == '17'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: snapshot
path: build/libs/*.jar
Expand All @@ -77,22 +77,17 @@ jobs:
needs: prep
if: github.event_name != 'pull_request' && needs.prep.outputs.release == 'true'
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java:
- 17
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v3
name: Set up Java
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
java-version: 17
java-package: jdk
distribution: 'zulu'
-
Expand Down Expand Up @@ -123,7 +118,7 @@ jobs:
-
name: Archive artifact
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release
path: build/libs/*.jar
Expand All @@ -146,12 +141,12 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
-
name: Set up Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
java-package: jdk
Expand All @@ -165,11 +160,12 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
-
name: Sonar
name: Test and Sonar
if: ${{ env.SONAR_TOKEN != null }}
run: |
if [ "${{ github.event_name }}" = "pull_request" ]; then
./gradlew sonarqube \
./gradlew test sonar \
-Dsonar.gradle.skipCompile=true \
-Dsonar.pullrequest.provider=github \
-Dsonar.pullrequest.github.repository=${{ github.repository }} \
-Dsonar.host.url=https://sonarcloud.io \
Expand All @@ -178,15 +174,17 @@ jobs:
-Dsonar.pullrequest.key=${{ github.event.number }} \
-Dsonar.pullrequest.base=${{ github.base_ref }}
elif [ "${{ needs.prep.outputs.release }}" = 'true' ]; then
./gradlew sonarqube \
./gradlew test sonar \
-Dsonar.gradle.skipCompile=true \
-Dsonar.pullrequest.provider=github \
-Dsonar.pullrequest.github.repository=${{ github.repository }} \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.organization=${SONAR_ORG_KEY} \
-Dsonar.projectKey=${SONAR_PROJECT_KEY} \
-Dsonar.projectVersion=${{ needs.prep.outputs.version }}
else
./gradlew sonarqube \
./gradlew test sonar \
-Dsonar.gradle.skipCompile=true \
-Dsonar.pullrequest.provider=github \
-Dsonar.pullrequest.github.repository=${{ github.repository }} \
-Dsonar.host.url=https://sonarcloud.io \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG SONARQUBE_VERSION

FROM gradle:7.3.3-jdk11-alpine as builder
FROM gradle:8.5-jdk17-alpine as builder

COPY . /home/build/project
WORKDIR /home/build/project
Expand Down
Loading