Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #50 from jaydee029/main
Browse files Browse the repository at this point in the history
Added report generation and uploading , upgraded gradle version
  • Loading branch information
jadecarino authored Aug 20, 2024
2 parents 2d2a226 + 5ea75d0 commit 358afa5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 12 deletions.
23 changes: 16 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'semeru'

# The githash is added to the development Maven registry to show what commit level it contains
Expand All @@ -58,7 +58,7 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2
gradle-version: 8.9

- name: Build Gradle source code
if: github.event_name == 'push'
Expand All @@ -68,12 +68,13 @@ jobs:
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
run: |
gradle check publish \
set -o pipefail
gradle check publish --info \
-PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/wrapping \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo \
-PjacocoEnabled=true \
-PisMainOrRelease=true
-PisMainOrRelease=true 2>&1 | tee build.log
- name: Build Gradle source code
if: github.event_name == 'workflow_dispatch' # Use the input values provided by the workflow dispatch.
Expand All @@ -83,13 +84,21 @@ jobs:
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_KEY }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
run: |
gradle check publish \
set -o pipefail
gradle check publish --info \
-PsourceMaven=https://development.galasa.dev/${{ env.ARGO_APP_BRANCH }}/maven-repo/wrapping \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo \
-PjacocoEnabled=${{ inputs.jacocoEnabled }} \
-PisMainOrRelease=${{ inputs.isMainOrRelease }}
-PisMainOrRelease=${{ inputs.isMainOrRelease }} 2>&1 | tee build.log
- name: Upload Gradle Build Log
if: always()
uses: actions/upload-artifact@v4
with:
name: gradle-build-log
path: build.log

- name: Login to Github Container Registry
uses: docker/login-action@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup JDK
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'semeru'

# The githash is added to the development Maven registry to show what commit level it contains
Expand All @@ -31,14 +31,14 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v3
with:
gradle-version: 6.9.2
gradle-version: 8.9

- name: Build Gradle source code
- name: Build Gradle source code
run: |
gradle check publish \
gradle check publish --info \
-PsourceMaven=https://repo.maven.apache.org/maven2/ \
-PcentralMaven=https://repo.maven.apache.org/maven2/ \
-PtargetMaven=${{ github.workspace }}/repo
-PtargetMaven=${{ github.workspace }}/repo
- name: Extract metadata for Gradle image
id: metadata
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
!src/**/build/
bin/
wrapper/
build.log

# Ignore Gradle GUI config
gradle-app.setting
Expand Down

0 comments on commit 358afa5

Please sign in to comment.