Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate format profile as part of CI checks #6027

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Activate format profile as part of CI checks #6027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ca63f9
Activate format profile as part of CI checks
jamesnetherton Apr 23, 2024
3b50782
Clean up leftovers from MicroProfile Fault Tolerance disablement
jamesnetherton Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/camel-master-cron.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,12 @@ jobs:
&& cd camel \
&& echo "Current Camel commit:" $(git rev-parse HEAD) \
&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C
- name: Update extension metadata
run: |
./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS}
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip
eval ./mvnw ${CQ_MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip -Pformat
- name: Sync Maven properties
run: |
./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ci-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,12 @@ jobs:
with:
ref: ${{ env.CHECKOUT_REF }}
fetch-depth: 0
- name: Update extension metadata
run: |
./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS}
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip -Pformat
- name: Sync Maven properties
run: |
./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/quarkus-master-cron.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,12 @@ jobs:
&& echo "Current Quarkus commit:" $(git rev-parse HEAD) \
&& sed -i '/<module>integration-tests<\/module>/d' pom.xml \
&& ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C
- name: Update extension metadata
run: |
./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS}
- name: mvn clean install -DskipTests
run: |
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip -Pformat
- name: Sync Maven properties
run: |
./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
Expand Down
13 changes: 0 additions & 13 deletions integration-tests/foundation-grouped/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,19 +456,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-fault-tolerance-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mock-deployment</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,7 @@
</sourcePoms>
<destinationPom>${basedir}/integration-tests/compression-grouped/pom.xml</destinationPom>
</mergePom>
<!-- TODO: https://github.com/apache/camel-quarkus/issues/5995
<mergePom>
<sourcePoms>
<directory>${basedir}/integration-test-groups/foundation</directory>
Expand All @@ -983,6 +984,7 @@
</sourcePoms>
<destinationPom>${basedir}/integration-tests/foundation-grouped/pom.xml</destinationPom>
</mergePom>
-->
<mergePom>
<sourcePoms>
<directory>${basedir}/integration-test-groups/mongodb</directory>
Expand Down
Loading