From 59b09a4176d28bdb2cd60aa0e4c128a33650031b Mon Sep 17 00:00:00 2001 From: Benjamin Muschko Date: Wed, 8 Nov 2023 12:02:36 -0600 Subject: [PATCH] Only set up Gradle action once --- .github/workflows/linux-build-release.yml | 34 +++++++---------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/.github/workflows/linux-build-release.yml b/.github/workflows/linux-build-release.yml index 4e2cd57a7..6c1e3c0e9 100644 --- a/.github/workflows/linux-build-release.yml +++ b/.github/workflows/linux-build-release.yml @@ -22,39 +22,27 @@ jobs: run: | docker run -d -p 5000:5000 --restart=always --name registry registry:2 docker run -d -p 5001:5000 --restart=always --name secure_registry -v "$(pwd)"/src/functTest/resources/auth:/auth:rw -e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" registry:2 - - name: Compilation + - name: Set up Gradle uses: gradle/gradle-build-action@v2 - with: - arguments: classes + - name: Compilation + run: ./gradlew classes - name: Validate plugins - uses: gradle/gradle-build-action@v2 - with: - arguments: validatePlugins + run: ./gradlew validatePlugins - name: Unit tests - uses: gradle/gradle-build-action@v2 - with: - arguments: test + run: ./gradlew test - name: Integration tests - uses: gradle/gradle-build-action@v2 - with: - arguments: integrationTest + run: ./gradlew integrationTest - name: Functional tests - uses: gradle/gradle-build-action@v2 env: DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} HARBOR_USERNAME: ${{ secrets.HARBOR_USERNAME }} HARBOR_PASSWORD: ${{ secrets.HARBOR_PASSWORD }} - with: - arguments: functionalTest + run: ./gradlew functionalTest - name: Documentation tests - uses: gradle/gradle-build-action@v2 - with: - arguments: docTest + run: ./gradlew docTest - name: Assemble artifacts - uses: gradle/gradle-build-action@v2 - with: - arguments: assemble javadoc asciidoctorAllGuides + run: ./gradlew assemble javadoc asciidoctorAllGuides - name: Upload binaries uses: actions/upload-artifact@v3 with: @@ -74,6 +62,4 @@ jobs: build/docs/asciidocUserGuide/ - name: Release if: startsWith(github.ref, 'refs/tags/') - uses: gradle/gradle-build-action@v2 - with: - arguments: publishPlugins gitPublishPush -Pgradle.publish.key=${{ secrets.PLUGIN_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.PLUGIN_PORTAL_SECRET }} -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GITHUB_TOKEN }} -is + run: ./gradlew publishPlugins gitPublishPush -Pgradle.publish.key=${{ secrets.PLUGIN_PORTAL_KEY }} -Pgradle.publish.secret=${{ secrets.PLUGIN_PORTAL_SECRET }} -Dorg.ajoberstar.grgit.auth.username=${{ secrets.GITHUB_TOKEN }} -is