From 95a895b5a1084e052805fc075dbbd7e358ba3c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sat, 18 May 2024 23:15:35 +0200 Subject: [PATCH 1/2] feature(gradle): remove gradle-java from hidden resources Gradle support is now nearly complete, it can be enabled officially, in a beta status --- .github/workflows/github-actions.yml | 7 +------ src/main/resources/config/application-angular.yml | 1 - src/main/resources/config/application-react.yml | 1 - src/main/resources/config/application-vue.yml | 1 - src/main/resources/config/application.yml | 1 - 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 970a17198e3..6ba6ba0a358 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -109,8 +109,6 @@ jobs: run: npm ci - name: 'Lint: check' run: npm run lint:ci - - name: 'TEMP: enable gradle build tool slug' - run: sed -i '/- gradle-java/d' src/main/resources/config/application.yml - name: 'Start local Sonar' run: docker compose -f src/main/docker/sonar.yml up -d - name: 'Test: run backend tests' @@ -168,8 +166,6 @@ jobs: run: npm ci - name: 'Lint: check' run: npm run lint:ci - - name: 'TEMP: enable gradle build tool slug' - run: sed -i '/- gradle-java/d' src/main/resources/config/application.yml - name: 'Build application JAR' run: | chmod +x mvnw @@ -458,8 +454,7 @@ jobs: if: steps.tests-requirement-check.outputs.execute_tests == 'true' working-directory: /tmp/jhlite/${{ matrix.app }}/ run: | - # TODO: add also 'gradlew' once gradle support is more advanced - if [ -f 'mvnw' ]; then + if [ -f 'mvnw' ] || [ -f 'gradlew' ]; then ./start.sh fi diff --git a/src/main/resources/config/application-angular.yml b/src/main/resources/config/application-angular.yml index cabccfdca92..dc988756c5c 100644 --- a/src/main/resources/config/application-angular.yml +++ b/src/main/resources/config/application-angular.yml @@ -1,5 +1,4 @@ jhlite-hidden-resources.slugs: - - gradle-java - spring-boot-kafka-sample-producer-consumer - react-core - svelte-core diff --git a/src/main/resources/config/application-react.yml b/src/main/resources/config/application-react.yml index d0a234348ae..e2c73a92b72 100644 --- a/src/main/resources/config/application-react.yml +++ b/src/main/resources/config/application-react.yml @@ -1,5 +1,4 @@ jhlite-hidden-resources.slugs: - - gradle-java - spring-boot-kafka-sample-producer-consumer - angular-core - svelte-core diff --git a/src/main/resources/config/application-vue.yml b/src/main/resources/config/application-vue.yml index 5fde7e08985..3019da9adb1 100644 --- a/src/main/resources/config/application-vue.yml +++ b/src/main/resources/config/application-vue.yml @@ -1,5 +1,4 @@ jhlite-hidden-resources.slugs: - - gradle-java - spring-boot-kafka-sample-producer-consumer - angular-core - react-core diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index 11d692ad49c..0de3b19c54a 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -68,7 +68,6 @@ application: jhlite-hidden-resources: tags: banner slugs: - - gradle-java # gradle is hidden until it is fully supported - svelte-core server: From 0d7d49c018119d27b9bda489a158fac37a518e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Mino?= Date: Sat, 18 May 2024 23:41:25 +0200 Subject: [PATCH 2/2] fix: re-enable tricks for enabling gradle in ci for the main branch --- .github/workflows/github-actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 6ba6ba0a358..bc0d296f09b 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -166,6 +166,8 @@ jobs: run: npm ci - name: 'Lint: check' run: npm run lint:ci + - name: 'TEMP: enable gradle build tool slug' + run: sed -i '/- gradle-java/d' src/main/resources/config/application.yml - name: 'Build application JAR' run: | chmod +x mvnw