fix: source func CLI version from build ldflags

cmd/config_ci.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"io"
+	"regexp"
 	"strings"
 
 	"github.com/ory/viper"
@@ -11,8 +12,13 @@ import (
 	"knative.dev/func/cmd/common"
 	"knative.dev/func/pkg/ci/github"
 	fn "knative.dev/func/pkg/functions"
+	"knative.dev/func/pkg/version"
 )
 
+// gitDescribeSuffix matches the "-N-gHASH" suffix produced by git describe
+// on commits that are not exactly on a release tag.
+var gitDescribeSuffix = regexp.MustCompile(`-\d+-g[0-9a-f]+$`)
+
 // ciGeneratorFactory creates a CIGenerator from resolved CLI flag values.
 // Using a factory allows tests to capture the resolved config and inject
 // a mock generator without running the real implementation.
@@ -250,6 +256,7 @@ func newConfigAndLoadedFunc(
 		RegistryUserVar:        viper.GetString(registryUserVariableNameFlag),
 		RegistryPassSecret:     viper.GetString(registryPassSecretNameFlag),
 		RegistryUrlVar:         viper.GetString(registryUrlVariableNameFlag),
+		FuncCliVersion:         gitDescribeSuffix.ReplaceAllString(version.Kver, ""),
 		RegistryLogin:          viper.GetBool(registryLoginFlag),
 		SelfHostedRunner:       viper.GetBool(selfHostedRunnerFlag),
 		RemoteBuild:            viper.GetBool(remoteBuildFlag),

cmd/config_ci_int_test.go

@@ -231,7 +231,7 @@ func assertDefaultWorkflow(t *testing.T, actualGw string) {
 
 	assert.Assert(t, yamlContains(actualGw, "Install func cli"))
 	assert.Assert(t, yamlContains(actualGw, "functions-dev/action@main"))
-	assert.Assert(t, yamlContains(actualGw, "version: knative-v1.22.0"))
+	assert.Assert(t, yamlContains(actualGw, "version: "+github.DefaultFuncCliVersion))
 	assert.Assert(t, yamlContains(actualGw, "name: func"))
 
 	assert.Assert(t, yamlContains(actualGw, "Deploy function"))

pkg/ci/github/generator_test.go

@@ -566,6 +566,7 @@ func defaultOpts() opts {
 		RegistryUserVar:        github.DefaultRegistryUserVariableName,
 		RegistryPassSecret:     github.DefaultRegistryPassSecretName,
 		RegistryUrlVar:         github.DefaultRegistryUrlVariableName,
+		FuncCliVersion:         github.DefaultFuncCliVersion,
 		RegistryLogin:          github.DefaultRegistryLogin,
 		SelfHostedRunner:       github.DefaultSelfHostedRunner,
 		RemoteBuild:            github.DefaultRemoteBuild,
@@ -643,7 +644,7 @@ func assertDefaultWorkflow(t *testing.T, actualGw string) {
 
 	assert.Assert(t, yamlContains(actualGw, "Install func cli"))
 	assert.Assert(t, yamlContains(actualGw, "functions-dev/action@main"))
-	assert.Assert(t, yamlContains(actualGw, "version: knative-v1.22.0"))
+	assert.Assert(t, yamlContains(actualGw, "version: "+github.DefaultFuncCliVersion))
 	assert.Assert(t, yamlContains(actualGw, "name: func"))
 
 	assert.Assert(t, yamlContains(actualGw, "Deploy function"))
@@ -676,7 +677,7 @@ func assertSemiDefaultWorkflow(t *testing.T, actualGw string) {
 
 	assert.Assert(t, yamlContains(actualGw, "Install func cli"))
 	assert.Assert(t, yamlContains(actualGw, "functions-dev/action@main"))
-	assert.Assert(t, yamlContains(actualGw, "version: knative-v1.22.0"))
+	assert.Assert(t, yamlContains(actualGw, "version: "+github.DefaultFuncCliVersion))
 	assert.Assert(t, yamlContains(actualGw, "name: func"))
 
 	assert.Assert(t, yamlContains(actualGw, "Deploy function"))

pkg/ci/github/workflow.go

@@ -14,7 +14,7 @@ import (
 var ErrWorkflowExists = errors.New("existing GitHub workflow detected, overwrite using the --force option")
 
 const (
-	defaultFuncCliVersion               = "knative-v1.22.0"
+	DefaultFuncCliVersion               = "knative-v1.23.0"
 	DefaultPlatform                     = "github"
 	DefaultGitHubWorkflowDir            = ".github/workflows"
 	DefaultGitHubWorkflowFilename       = "func-deploy.yaml"
@@ -45,7 +45,8 @@ type WorkflowConfig struct {
 	RegistryLoginUrlVar,
 	RegistryUserVar,
 	RegistryPassSecret,
-	RegistryUrlVar string
+	RegistryUrlVar,
+	FuncCliVersion string
 	RegistryLogin,
 	SelfHostedRunner,
 	RemoteBuild,
@@ -74,6 +75,7 @@ func defaultWorkflowConfig() WorkflowConfig {
 		RegistryUserVar:        DefaultRegistryUserVariableName,
 		RegistryPassSecret:     DefaultRegistryPassSecretName,
 		RegistryUrlVar:         DefaultRegistryUrlVariableName,
+		FuncCliVersion:         DefaultFuncCliVersion,
 		RegistryLogin:          DefaultRegistryLogin,
 		SelfHostedRunner:       DefaultSelfHostedRunner,
 		RemoteBuild:            DefaultRemoteBuild,
@@ -111,6 +113,9 @@ func setEmptyFieldsToDefaults(defaults WorkflowConfig) WorkflowConfig {
 	if defaults.RegistryUrlVar == "" {
 		defaults.RegistryUrlVar = DefaultRegistryUrlVariableName
 	}
+	if defaults.FuncCliVersion == "" {
+		defaults.FuncCliVersion = DefaultFuncCliVersion
+	}
 
 	return defaults
 }
@@ -149,7 +154,7 @@ func newGitHubWorkflow(cfg WorkflowConfig, runtime string, messageWriter io.Writ
 	steps = createRuntimeTestStep(cfg, runtime, messageWriter, steps)
 	steps = createK8ContextStep(cfg, steps)
 	steps = createRegistryLoginStep(cfg, steps)
-	steps = createFuncCLIInstallStep(steps)
+	steps = createFuncCLIInstallStep(cfg, steps)
 
 	steps, err := createFuncDeployStep(cfg, runtime, steps)
 	if err != nil {
@@ -223,10 +228,10 @@ func createRegistryLoginStep(opts WorkflowConfig, steps []step) []step {
 	return append(steps, *loginToContainerRegistry)
 }
 
-func createFuncCLIInstallStep(steps []step) []step {
+func createFuncCLIInstallStep(cfg WorkflowConfig, steps []step) []step {
 	installFuncCli := newStep("Install func cli").
 		withUses("functions-dev/action@main").
-		withActionConfig("version", defaultFuncCliVersion).
+		withActionConfig("version", cfg.FuncCliVersion).
 		withActionConfig("name", "func")
 
 	return append(steps, *installFuncCli)