This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new ffa9631 Fix issues with building from the source release zip
ffa9631 is described below
commit ffa9631994f961026c1490d3a2448f99165c5780
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Jul 8 08:33:17 2020 +0100
Fix issues with building from the source release zip
Fixes #1460
---
.github/workflows/camel-master-cron.yaml | 4 ++--
.github/workflows/ci-build.yaml | 4 ++--
.github/workflows/quarkus-master-cron.yaml | 4 ++--
docs/modules/ROOT/pages/contributor-guide/promote-jvm-to-native.adoc | 2 +-
tooling/descriptors/src.xml | 4 ++--
{.github => tooling/scripts}/test-categories.yaml | 0
tooling/scripts/validate-github-workflows.groovy | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/camel-master-cron.yaml
b/.github/workflows/camel-master-cron.yaml
index 37e6b2d..c01f3e4 100644
--- a/.github/workflows/camel-master-cron.yaml
+++ b/.github/workflows/camel-master-cron.yaml
@@ -81,7 +81,7 @@ jobs:
run: |
sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64";
sudo chmod +x /usr/local/bin/yq
- CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p
"*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
+ CATEGORIES=$(cat tooling/scripts/test-categories.yaml | yq r -
--printMode p "*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
echo "::set-output name=matrix::{'category': [${CATEGORIES}]}"
- name: Report Build Failure
if: failure()
@@ -131,7 +131,7 @@ jobs:
- name: Integration Tests
run: |
TEST_MODULES=""
- for MODULE in $(cat .github/test-categories.yaml | yq r - "${{
matrix.category }}.*"); do
+ for MODULE in $(cat tooling/scripts/test-categories.yaml | yq r -
"${{ matrix.category }}.*"); do
if [ "${MODULE}" == "-" ]; then
continue
fi
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 487cbd7..ee98ab8 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -110,7 +110,7 @@ jobs:
run: |
sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64";
sudo chmod +x /usr/local/bin/yq
- CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p
"*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
+ CATEGORIES=$(cat tooling/scripts/test-categories.yaml | yq r -
--printMode p "*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
echo "::set-output name=matrix::{'category': [${CATEGORIES}]}"
build-alternative-jvm:
@@ -198,7 +198,7 @@ jobs:
TEST_MODULES: ${{matrix.test-modules}}
run: |
TEST_MODULES=""
- for MODULE in $(cat .github/test-categories.yaml | yq r - "${{
matrix.category }}.*"); do
+ for MODULE in $(cat tooling/scripts/test-categories.yaml | yq r -
"${{ matrix.category }}.*"); do
if [ "${MODULE}" == "-" ]; then
continue
fi
diff --git a/.github/workflows/quarkus-master-cron.yaml
b/.github/workflows/quarkus-master-cron.yaml
index 3d50ee0..c0169bf 100644
--- a/.github/workflows/quarkus-master-cron.yaml
+++ b/.github/workflows/quarkus-master-cron.yaml
@@ -90,7 +90,7 @@ jobs:
run: |
sudo wget -O /usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/3.2.1/yq_linux_amd64";
sudo chmod +x /usr/local/bin/yq
- CATEGORIES=$(cat .github/test-categories.yaml | yq r - --printMode p
"*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
+ CATEGORIES=$(cat tooling/scripts/test-categories.yaml | yq r -
--printMode p "*." | sed "s/\(.*\)/'\1'/" | sed ':a;N;$!ba;s/\n/,/g')
echo "::set-output name=matrix::{'category': [${CATEGORIES}]}"
- name: Report Build Failure
if: failure()
@@ -140,7 +140,7 @@ jobs:
- name: Integration Tests
run: |
TEST_MODULES=""
- for MODULE in $(cat .github/test-categories.yaml | yq r - "${{
matrix.category }}.*"); do
+ for MODULE in $(cat tooling/scripts/test-categories.yaml | yq r -
"${{ matrix.category }}.*"); do
if [ "${MODULE}" == "-" ]; then
continue
fi
diff --git
a/docs/modules/ROOT/pages/contributor-guide/promote-jvm-to-native.adoc
b/docs/modules/ROOT/pages/contributor-guide/promote-jvm-to-native.adoc
index 506ae74..763dc5c 100644
--- a/docs/modules/ROOT/pages/contributor-guide/promote-jvm-to-native.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/promote-jvm-to-native.adoc
@@ -35,7 +35,7 @@ The `promote` mojo does the following for you:
* Copies the rest of the extension code from `extensions-jvm/foo` to
`extensions/foo`
* Removes the warning build step from the processor class in the deployment
module
-4. Assign the integration test to an existing or new test category in
`.github/test-categories.yaml` so that
+4. Assign the integration test to an existing or new test category in
`tooling/scripts/test-categories.yaml` so that
it gets executed by the CI.
5. Add some meaningful tests to `FooTest` and make sure they pass in both JVM
and native mode:
diff --git a/tooling/descriptors/src.xml b/tooling/descriptors/src.xml
index cad9318..f9445c7 100644
--- a/tooling/descriptors/src.xml
+++ b/tooling/descriptors/src.xml
@@ -40,8 +40,6 @@
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
- <!-- exclude>data/**</exclude>
- <exclude>*/data/**</exclude -->
<exclude>activemq-data/**</exclude>
<exclude>*/activemq-data/**</exclude>
<exclude>**/eclipse-classes/**</exclude>
@@ -66,6 +64,8 @@
<exclude>**/node_modules/**</exclude>
<exclude>**/.flattened-pom.xml</exclude>
+
+ <exclude>**/mvnw**</exclude>
</excludes>
</fileSet>
diff --git a/.github/test-categories.yaml b/tooling/scripts/test-categories.yaml
similarity index 100%
rename from .github/test-categories.yaml
rename to tooling/scripts/test-categories.yaml
diff --git a/tooling/scripts/validate-github-workflows.groovy
b/tooling/scripts/validate-github-workflows.groovy
index 4b408de..bdf9a78 100644
--- a/tooling/scripts/validate-github-workflows.groovy
+++ b/tooling/scripts/validate-github-workflows.groovy
@@ -24,7 +24,7 @@ import org.yaml.snakeyaml.Yaml
final Path treeRootDir = project.getBasedir().toPath()
-final String testCategoriesDefRelPath = '.github/test-categories.yaml'
+final String testCategoriesDefRelPath = 'tooling/scripts/test-categories.yaml'
final Path jobDefPath = treeRootDir.resolve(testCategoriesDefRelPath)
final Set<String> executedBaseNames = [] as Set
