From 112a3f23e96363a15b8398b4bdf578834e0d28ab Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Wed, 31 Jul 2024 09:05:46 -0500 Subject: [PATCH] Use `setup-gradle` action where Gradle builds occur --- .github/workflows/build-docker-mariadb.yml | 2 ++ .github/workflows/build-docker-postgresql.yml | 2 ++ .github/workflows/build-documentation.yml | 2 ++ .github/workflows/build-mariadb.yml | 6 ++++-- .github/workflows/build-mysql.yml | 6 ++++-- .github/workflows/build-postgresql.yml | 6 ++++-- .github/workflows/build-tests.yml | 2 ++ .github/workflows/publish-dockerhub.yml | 2 ++ .github/workflows/smoke-activemq.yml | 2 ++ .github/workflows/smoke-kafka.yml | 2 ++ .github/workflows/sonarqube.yml | 6 ++++-- 11 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-docker-mariadb.yml b/.github/workflows/build-docker-mariadb.yml index 84a08598459..83c7d044024 100644 --- a/.github/workflows/build-docker-mariadb.yml +++ b/.github/workflows/build-docker-mariadb.yml @@ -20,6 +20,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Build the image run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber - name: Start the stack diff --git a/.github/workflows/build-docker-postgresql.yml b/.github/workflows/build-docker-postgresql.yml index 148b524cec3..11d3726ea43 100644 --- a/.github/workflows/build-docker-postgresql.yml +++ b/.github/workflows/build-docker-postgresql.yml @@ -20,6 +20,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Build the image run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber - name: Start the Standalone Stack diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml index 463fe9ab5ce..36962f45e4a 100644 --- a/.github/workflows/build-documentation.yml +++ b/.github/workflows/build-documentation.yml @@ -19,6 +19,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4 with: node-version: 16 diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index 0f3393fb68f..bbe770b1fd8 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -43,8 +43,10 @@ jobs: node-version: 16 - name: Congfigure vega-cli run: npm i -g vega-cli --unsafe - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 + - name: Setup Gradle and Validate Wrapper + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 + with: + validate-wrappers: true - name: Verify MariaDB connection run: | while ! mysqladmin ping -h"127.0.0.1" -P3306 ; do diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml index 1d81fe102e6..3a768f7bbd8 100644 --- a/.github/workflows/build-mysql.yml +++ b/.github/workflows/build-mysql.yml @@ -43,8 +43,10 @@ jobs: node-version: 16 - name: Congfigure vega-cli run: npm i -g vega-cli --unsafe - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 + - name: Setup Gradle and Validate Wrapper + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 + with: + validate-wrappers: true - name: Verify MariaDB connection run: | while ! mysqladmin ping -h"127.0.0.1" -P3306 ; do diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml index eec510887c0..3369f33e568 100644 --- a/.github/workflows/build-postgresql.yml +++ b/.github/workflows/build-postgresql.yml @@ -44,8 +44,10 @@ jobs: node-version: 16 - name: Congfigure vega-cli run: npm i -g vega-cli --unsafe - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 + - name: Setup Gradle and Validate Wrapper + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 + with: + validate-wrappers: true - name: Verify PostgreSQL connection run: | while ! pg_isready -d postgres -U root -h 127.0.0.1 -p 5432 ; do diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index c622547415a..2d585a264f0 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -20,6 +20,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Build the image run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber - name: Start the Fineract stack diff --git a/.github/workflows/publish-dockerhub.yml b/.github/workflows/publish-dockerhub.yml index ab1260a4932..3c3510b9067 100644 --- a/.github/workflows/publish-dockerhub.yml +++ b/.github/workflows/publish-dockerhub.yml @@ -26,6 +26,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Extract branch name shell: bash run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT diff --git a/.github/workflows/smoke-activemq.yml b/.github/workflows/smoke-activemq.yml index e5225b61d67..a4ea77a8a6a 100644 --- a/.github/workflows/smoke-activemq.yml +++ b/.github/workflows/smoke-activemq.yml @@ -20,6 +20,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Build the image run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber - name: Start the ActiveMQ Stack diff --git a/.github/workflows/smoke-kafka.yml b/.github/workflows/smoke-kafka.yml index c6ca4a6f3b6..072b543e427 100644 --- a/.github/workflows/smoke-kafka.yml +++ b/.github/workflows/smoke-kafka.yml @@ -20,6 +20,8 @@ jobs: with: java-version: '17' distribution: 'zulu' + - name: Setup Gradle + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 - name: Build the image run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber - name: Start the Kafka Stack diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index b4096fb6c3e..dad017e09ce 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -28,7 +28,9 @@ jobs: with: java-version: '17' distribution: 'zulu' - - name: Validate Gradle wrapper - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 + - name: Setup Gradle and Validate Wrapper + uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70 # v3.5.0 + with: + validate-wrappers: true - name: Sonarqube run: ./gradlew --no-daemon --console=plain -Dsonar.verbose=true -Dsonar.login=$SONAR_TOKEN -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.organization=$SONAR_ORGANIZATION -Dsonar.projectKey=$SONAR_PROJECT_KEY --info --stacktrace sonarqube