mirror of https://github.com/knative/func.git
Preserve func.yaml for Quarkus BP build (#1092)
Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
parent
04b32d15c6
commit
d4f96bb694
|
|
@ -27,7 +27,7 @@ func validatePipeline(f fn.Function) error {
|
|||
return ErrRuntimeRequired
|
||||
}
|
||||
|
||||
if f.Runtime == "go" || f.Runtime == "rust" || f.Runtime == "quarkus" {
|
||||
if f.Runtime == "go" || f.Runtime == "rust" {
|
||||
return ErrRuntimeNotSupported{f.Runtime}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@ func Test_validatePipeline(t *testing.T) {
|
|||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "Unsupported runtime - Quarkus - without additional Buildpacks",
|
||||
name: "Supported runtime - Quarkus - without additional Buildpacks",
|
||||
function: fn.Function{Runtime: "quarkus"},
|
||||
wantErr: true,
|
||||
wantErr: false,
|
||||
},
|
||||
{
|
||||
name: "Unsupported runtime - Rust - without additional Buildpacks",
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ buildEnvs:
|
|||
- name: BP_NATIVE_IMAGE
|
||||
value: "true"
|
||||
- name: BP_MAVEN_BUILT_ARTIFACT
|
||||
value: target/native-sources/*
|
||||
value: func.yaml target/native-sources/*
|
||||
- name: BP_MAVEN_BUILD_ARGUMENTS
|
||||
value: package -DskipTests=true -Dmaven.javadoc.skip=true -Dquarkus.package.type=native-sources
|
||||
- name: BP_NATIVE_IMAGE_BUILD_ARGUMENTS_FILE
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ buildEnvs:
|
|||
- name: BP_NATIVE_IMAGE
|
||||
value: "true"
|
||||
- name: BP_MAVEN_BUILT_ARTIFACT
|
||||
value: target/native-sources/*
|
||||
value: func.yaml target/native-sources/*
|
||||
- name: BP_MAVEN_BUILD_ARGUMENTS
|
||||
value: package -DskipTests=true -Dmaven.javadoc.skip=true -Dquarkus.package.type=native-sources
|
||||
- name: BP_NATIVE_IMAGE_BUILD_ARGUMENTS_FILE
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ buildEnvs:
|
|||
- name: BP_NATIVE_IMAGE
|
||||
value: "false"
|
||||
- name: BP_MAVEN_BUILT_ARTIFACT
|
||||
value: target/quarkus-app/lib/ target/quarkus-app/*.jar target/quarkus-app/app/ target/quarkus-app/quarkus/
|
||||
value: func.yaml target/quarkus-app/lib/ target/quarkus-app/*.jar target/quarkus-app/app/ target/quarkus-app/quarkus/
|
||||
- name: BP_MAVEN_BUILD_ARGUMENTS
|
||||
value: package -DskipTests=true -Dmaven.javadoc.skip=true -Dquarkus.package.type=fast-jar
|
||||
- name: MAVEN_S2I_ARTIFACT_DIRS
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue