You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/06/18 15:12:15 UTC
[camel-k-runtime] 03/48: Adjust to use the correct Camel Quarkus
branch for camel-main builds
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 06ff0d0c23e25032b959b0985f8532abd9c845b7
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Tue May 25 11:08:03 2021 +0200
Adjust to use the correct Camel Quarkus branch for camel-main builds
---
.github/workflows/ci-build-camel-main.yaml | 8 ++++----
.github/workflows/ci-build.yml | 1 -
.github/workflows/pr-validate.yml | 1 -
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci-build-camel-main.yaml b/.github/workflows/ci-build-camel-main.yaml
index 0cb7ea2..b6fa7e5 100644
--- a/.github/workflows/ci-build-camel-main.yaml
+++ b/.github/workflows/ci-build-camel-main.yaml
@@ -35,7 +35,7 @@ on:
- 'Jenkinsfile'
pull_request:
branches:
- - camel-master
+ - camel-main
paths-ignore:
- '**.adoc'
- 'KEYS'
@@ -68,11 +68,11 @@ jobs:
# && cd camel \
# && echo "Current Camel commit:" $(git rev-parse HEAD) \
# && ./mvnw ${MAVEN_ARGS} clean install -Pfastinstall
- - name: Build camel-quarkus (camel-main)
+ - name: Build camel-quarkus (main)
run: |
git clone --depth 1 --branch main https://github.com/apache/camel-quarkus.git \
&& cd camel-quarkus \
&& echo "Current Camel Quarkus commit:" $(git rev-parse HEAD) \
- && ./mvnw ${MAVEN_ARGS} clean install -Dquickly -s $(pwd)/settings-camel-3.7.0.xml
+ && ./mvnw ${MAVEN_ARGS} clean install -Dquickly
- name: Build camel-k-runtime
- run: ./mvnw ${MAVEN_ARGS} -Dcheckstyle.failOnViolation=true -Psourcecheck clean install
+ run: ./mvnw ${MAVEN_ARGS} -Dcheckstyle.failOnViolation=true -Psourcecheck clean verify
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index e2205d8..cd447cf 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -27,7 +27,6 @@ on:
push:
branches:
- main
- - camel-main
paths-ignore:
- '**.adoc'
- 'KEYS'
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index cc352e8..09b59f9 100644
--- a/.github/workflows/pr-validate.yml
+++ b/.github/workflows/pr-validate.yml
@@ -27,7 +27,6 @@ on:
pull_request:
branches:
- main
- - camel-main
paths-ignore:
- '**.adoc'
- 'KEYS'