You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/08/17 06:20:43 UTC
[camel-quarkus] branch main updated (7d0e3808ff -> 5f7f579e18)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 7d0e3808ff Fix route inclusion / exclusion filtering
new a25812a829 Clean up redundant plugin executions for the docs module
new 5f7f579e18 Remove docs module verification step from CI build as it is now a manual step
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 13 ++----
.github/workflows/quarkus-master-cron.yaml | 2 +-
docs/pom.xml | 74 ------------------------------
4 files changed, 5 insertions(+), 86 deletions(-)
[camel-quarkus] 01/02: Clean up redundant plugin executions for the docs module
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a25812a82901d389f5b4b8202c7359ae8bae6b34
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 16 15:08:28 2022 +0100
Clean up redundant plugin executions for the docs module
---
docs/pom.xml | 74 ------------------------------------------------------------
1 file changed, 74 deletions(-)
diff --git a/docs/pom.xml b/docs/pom.xml
index ab6ae83496..82c812acdc 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -65,80 +65,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven-version</id>
- <phase>none</phase><!-- skip to save time -->
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>process-resource-bundles</id>
- <phase>none</phase><!-- skip to save time -->
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>full</id>
- <activation>
- <property>
- <name>!quickly</name>
- </property>
- </activation>
- <build>
- <plugins>
-<!-- <plugin>-->
-<!-- <groupId>com.github.eirslett</groupId>-->
-<!-- <artifactId>frontend-maven-plugin</artifactId>-->
-<!-- <version>${frontend-maven-plugin.version}</version>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>install node and yarn</id>-->
-<!-- <goals>-->
-<!-- <goal>install-node-and-yarn</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <nodeVersion>v14.16.0</nodeVersion>-->
-<!-- <yarnVersion>v1.22.5</yarnVersion>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- <execution>-->
-<!-- <id>yarn install</id>-->
-<!-- <goals>-->
-<!-- <goal>yarn</goal>-->
-<!-- </goals>-->
-<!-- <phase>verify</phase>-->
-<!-- <configuration>-->
-<!-- <arguments>install --immutable</arguments>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- <!– TODO: Enable checks once docs issues are fixed https://github.com/apache/camel-quarkus/issues/3307-->
-<!-- <execution>-->
-<!-- <id>antora-xref-check</id>-->
-<!-- <goals>-->
-<!-- <goal>yarn</goal>-->
-<!-- </goals>-->
-<!-- <phase>verify</phase>-->
-<!-- <configuration>-->
-<!-- <arguments>run checks</arguments>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- –>-->
-<!-- </executions>-->
-<!-- </plugin>-->
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
[camel-quarkus] 02/02: Remove docs module verification step from CI build as it is now a manual step
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5f7f579e185645351aa697bd20fd40042ca42981
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Aug 16 15:09:09 2022 +0100
Remove docs module verification step from CI build as it is now a manual step
---
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 13 +++----------
.github/workflows/quarkus-master-cron.yaml | 2 +-
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml
index a335f2b6f3..eeb26b8871 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -72,7 +72,7 @@ jobs:
git rev-parse origin/main > ~/build-data/main-sha.txt
- name: Build Camel Quarkus
run: |
- ./mvnw ${MAVEN_ARGS} clean install -Papache-snapshots -pl '!docs' --fail-at-end
+ ./mvnw ${MAVEN_ARGS} clean install -Papache-snapshots --fail-at-end
- name: Tar Maven Repo
shell: bash
run: tar -czf maven-repo.tgz -C ~ build-data .m2/repository
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 52c5ec43d5..f09e35e7f3 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -70,7 +70,7 @@ jobs:
- name: Setup apache-snapshots profile
if: github.ref == 'refs/heads/camel-main' || github.base_ref == 'camel-main'
run: |
- echo "BRANCH_OPTIONS=-Papache-snapshots -pl '!docs'" >> $GITHUB_ENV
+ echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV
- name: Setup oss-snapshots profile
if: github.ref == 'refs/heads/quarkus-main' || github.base_ref == 'quarkus-main'
run: |
@@ -91,7 +91,7 @@ jobs:
uses: actions/checkout@v2
- name: mvn clean install -DskipTests
run: |
- eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip -Dskip.installyarn -Dskip.yarn
+ eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip
- name: Sync Maven properties
run: |
./mvnw cq:sync-versions ${MAVEN_ARGS} -N
@@ -193,7 +193,7 @@ jobs:
run: |
[[ -z $(git status --porcelain) ]] || { echo 'There are uncommitted changes'; git status; exit 1; }
- functional-extension-tests-and-docs:
+ functional-extension-tests:
runs-on: ubuntu-latest
needs: initial-mvn-install
if: github.event_name != 'pull_request' || !contains(github.event.pull_request.labels.*.name, 'JVM')
@@ -243,13 +243,6 @@ jobs:
../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
-Dformatter.skip -Dimpsort.skip -Denforcer.skip -Dcamel-quarkus.update-extension-doc-page.skip \
test
- - name: cd docs && mvn verify
- if: github.ref != 'refs/heads/camel-main' && github.base_ref != 'camel-main'
- run: |
- cd docs
- ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \
- -Dformatter.skip -Dimpsort.skip -Denforcer.skip \
- verify
extensions-jvm-tests:
runs-on: ubuntu-latest
diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml
index 8030729f19..3773fb06ae 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -78,7 +78,7 @@ jobs:
&& ./mvnw ${MAVEN_ARGS} clean install -Dquickly
- name: Build Camel Quarkus
run: |
- ./mvnw ${MAVEN_ARGS} clean install -Dquarkus.version=999-SNAPSHOT -pl '!docs' --fail-at-end
+ ./mvnw ${MAVEN_ARGS} clean install -Dquarkus.version=999-SNAPSHOT --fail-at-end
- name: Tar Maven Repo
shell: bash
run: |