[gradle enterprise] various enhancements (#15607)

* use enforce-maven as the ID

* remove enforce formula use mvn clean in workflow
This commit is contained in:
William Cheng 2023-05-26 15:33:50 +08:00 committed by GitHub
parent 4c7963cf54
commit 8457dbf1a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 88 deletions

View File

@ -38,7 +38,7 @@ jobs:
env: env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
run: | run: |
mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error mvn clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate) (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
(cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk) (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk)

View File

@ -52,7 +52,7 @@ jobs:
- name: Build with Maven - name: Build with Maven
shell: bash shell: bash
run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml run: mvn clean -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress install --file pom.xml
env: env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
@ -74,7 +74,7 @@ jobs:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
run: | run: |
cd modules/openapi-generator-maven-plugin cd modules/openapi-generator-maven-plugin
mvn verify -Pintegration mvn clean verify -Pintegration
verify: verify:
name: Verify outputs on ${{ matrix.os }} name: Verify outputs on ${{ matrix.os }}

View File

@ -36,7 +36,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build- ${{ runner.os }}-build-
- name: Run maven - name: Run maven
run: mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error run: mvn clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
env: env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
- run: ls -la modules/openapi-generator-cli/target - run: ls -la modules/openapi-generator-cli/target
@ -74,7 +74,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}- ${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build- ${{ runner.os }}-build-
- name: Run unit tests - name: Run unit tests
run: mvn --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error run: mvn clean --no-snapshot-updates --batch-mode --quiet --fail-at-end test -Dorg.slf4j.simpleLogger.defaultLogLevel=error
env: env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
- name: Publish unit test reports - name: Publish unit test reports

View File

@ -44,7 +44,7 @@ jobs:
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
maven-version: 3.9.0 maven-version: 3.9.0
- name: Run maven - name: Run maven
run: mvn --no-snapshot-updates --batch-mode --quiet install run: mvn clean --no-snapshot-updates --batch-mode --quiet install
env: env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }} GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
- name: Setup Gradle - name: Setup Gradle

83
pom.xml
View File

@ -287,7 +287,7 @@
<version>3.3.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>enforce-versions</id> <id>enforce-maven</id>
<goals> <goals>
<goal>enforce</goal> <goal>enforce</goal>
</goals> </goals>
@ -399,87 +399,6 @@
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<version>${git-commit-id-plugin.version}</version> <version>${git-commit-id-plugin.version}</version>
</plugin> </plugin>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-versions</id>
<inputs>
<properties>
<property>
<name>fail</name>
</property>
<property>
<name>failFast</name>
</property>
<property>
<name>failIfNoRules</name>
</property>
<property>
<name>rulesToSkip</name>
</property>
<property>
<name>rulesToExecute</name>
</property>
<property>
<name>rules</name>
</property>
<property>
<name>skip</name>
</property>
</properties>
<ignoredProperties>
<ignore>ignoreCache</ignore>
<ignore>mojoExecution</ignore>
<ignore>session</ignore>
</ignoredProperties>
</inputs>
<nestedProperties>
<property>
<name>project</name>
<iteratedProperties>
<property>
<name>dependencies</name>
<inputs>
<properties>
<property>
<name>groupId</name>
</property>
<property>
<name>artifactId</name>
</property>
<property>
<name>version</name>
</property>
<property>
<name>type</name>
</property>
<property>
<name>scope</name>
</property>
</properties>
</inputs>
</property>
</iteratedProperties>
</property>
</nestedProperties>
<outputs>
<cacheableBecause>version check should run in every build</cacheableBecause>
</outputs>
</execution>
</executions>
</plugin>
</plugins>
</gradleEnterprise>
</configuration>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>