Skip to content

Commit 9e190af

Browse files
Fix:func go build error - s2i linux/amd64
1 parent b990215 commit 9e190af

5 files changed

Lines changed: 11 additions & 487 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ test: generate/zz_filesystem_generated.go ## Run core unit tests
7373

7474
.PHONY: check
7575
check: $(BIN_GOLANGCI_LINT) ## Check code quality (lint)
76-
$(BIN_GOLANGCI_LINT) run --timeout 300s
77-
cd test && $(BIN_GOLANGCI_LINT) run --timeout 300s
76+
$(BIN_GOLANGCI_LINT) run --timeout 600s
77+
cd test && $(BIN_GOLANGCI_LINT) run --timeout 600s
7878

7979
$(BIN_GOLANGCI_LINT):
8080
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v2.5.0

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,3 +312,5 @@ require (
312312
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
313313
sigs.k8s.io/yaml v1.6.0 // indirect
314314
)
315+
316+
replace github.com/openshift/source-to-image => github.com/openshift/source-to-image v1.5.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU
860860
github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U=
861861
github.com/openshift-pipelines/pipelines-as-code v0.31.0 h1:dUUvnwCrhSmr3IYjsywLD7QTNAINetFoLCIO4529nOk=
862862
github.com/openshift-pipelines/pipelines-as-code v0.31.0/go.mod h1:74yRkJfqVzMp2iiq3IBm8Lt1q1EAHMIHb53/Au+2IVM=
863-
github.com/openshift/source-to-image v1.6.0 h1:u5jK0KPOOUEHkUw+6X3Kae0l762yR8aYUm/tZX3oa60=
864-
github.com/openshift/source-to-image v1.6.0/go.mod h1:ZNfsBThrFHlIgkzqz2NyXqAsb8d7eESBiE73zR07BXo=
863+
github.com/openshift/source-to-image v1.5.1 h1:mtV2Nh1jVeLg5S02HIbk3GmGYS912hWCCbASEadAS6M=
864+
github.com/openshift/source-to-image v1.5.1/go.mod h1:ZNfsBThrFHlIgkzqz2NyXqAsb8d7eESBiE73zR07BXo=
865865
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
866866
github.com/ory/viper v1.7.5 h1:+xVdq7SU3e1vNaCsk/ixsfxE4zylk1TJUiJrY647jUE=
867867
github.com/ory/viper v1.7.5/go.mod h1:ypOuyJmEUb3oENywQZRgeAMwqgOyDqwboO1tj3DjTaM=

main.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package main
22

3-
import "knative.dev/func/pkg/app"
3+
import (
4+
"fmt"
5+
"knative.dev/func/pkg/app"
6+
)
47

58
func main() {
9+
fmt.Println("project is running fine")
610
app.Main()
711
}

0 commit comments

Comments
 (0)