Merge branch 'v2' into dependabot/github_actions/actions/setup-go-6

Author: markphelps

.github/prompts/release.md

@@ -2,8 +2,8 @@ name: Contributor Assistant
 
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened]
-  check_run:
+    types: [opened]
+  check_suite:
     types: [completed]
 
 permissions:
@@ -12,14 +12,14 @@ permissions:
   checks: read
 
 jobs:
-  post-dco-comment:
+  check-dco:
     runs-on: ubuntu-latest
-    # Only run if triggered by PR events or if a check_run named "DCO" failed
+    # Only run for PR opened events or when check suite completes with failure
     if: |
-      github.event_name == 'pull_request_target' || 
-      (github.event_name == 'check_run' && 
-       github.event.check_run.name == 'DCO' && 
-       github.event.check_run.conclusion == 'failure')
+      github.event_name == 'pull_request_target' ||
+      (github.event_name == 'check_suite' &&
+       github.event.check_suite.conclusion == 'failure' &&
+       github.event.check_suite.pull_requests[0] != null)
     steps:
       - name: Get Pull Request and Check DCO Status
         id: check_dco
@@ -28,16 +28,16 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             let prNumber;
-            
+
             // Get PR number based on event type
             if (context.eventName === 'pull_request_target') {
               prNumber = context.issue.number;
-            } else if (context.eventName === 'check_run') {
-              const pulls = context.payload.check_run.pull_requests;
+            } else if (context.eventName === 'check_suite') {
+              const pulls = context.payload.check_suite.pull_requests;
               if (pulls && pulls.length > 0) {
                 prNumber = pulls[0].number;
               } else {
-                console.log('No PR associated with this check run');
+                console.log('No PR associated with this check suite');
                 return;
               }
             }

.github/workflows/contributors.yml

@@ -53,7 +53,8 @@ jobs:
         id: cache-key
         run: |
           # Create cache key from git commit and relevant source files
-          key="flipt-$(git rev-parse --short HEAD)-$(find . -name '*.go' -o -name 'go.*' -o -name '*.json' | head -20 | sort | xargs sha256sum | sha256sum | cut -d' ' -f1 | head -c 8)"
+          # Suppress SIGPIPE error from find when head closes the pipe early
+          key="flipt-$(git rev-parse --short HEAD)-$(find . -name '*.go' -o -name 'go.*' -o -name '*.json' 2>/dev/null | head -20 | sort | xargs sha256sum | sha256sum | cut -d' ' -f1 | head -c 8)"
           echo "key=$key" >> $GITHUB_OUTPUT
           echo "Cache key: $key"
 

.github/workflows/integration-test.yml

@@ -66,7 +66,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "~> v2.11.0"
+          version: "~> v2.12"
           args: build --clean -f .goreleaser.${{ matrix.name }}.yml
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
@@ -154,7 +154,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser-pro
-          version: "~> v2.11.0"
+          version: "~> v2.12"
           args: release --clean
         env:
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}

.github/workflows/release.yml

@@ -70,3 +70,7 @@ _tools
 # AI generated files
 .claude*
 .cursor*
+
+# Go workspace files
+go.work
+go.work.sum

.gitignore

@@ -75,12 +75,6 @@ changelog:
     - title: "Other"
       order: 3
 
-  ai:
-    use: anthropic
-    prompt:
-      from_file:
-        path: .github/prompts/release.md
-
 dockers:
   - dockerfile: ./build/Dockerfile
     use: buildx

.goreleaser.yml

@@ -3,6 +3,28 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.0](https://github.com/flipt-io/flipt/releases/tag/v2.2.0) - 2025-10-02
+
+### Added
+
+- **CLI license management**: New `flipt license` command with interactive TUI wizard for managing Flipt Pro licenses (#4767)
+- **Boolean evaluation**: Include segments in boolean flag evaluation response for consistency (#4767)
+
+### Fixed
+
+- **UI environment sync**: Refetch environments when window regains focus or network reconnects to ensure UI stays in sync (#4774)
+- **Git branch cleanup**: Remove deleted branches from UI when synced from Git repositories (#4770)
+- **Docker build**: Correct ARG declaration placement in Dockerfile to resolve build issues (#4772)
+- **OpenTelemetry compatibility**: Resolve schema URL conflicts and update to compatible exporter versions
+
+### Changed
+
+- **OpenTelemetry conventions**: Align event and attribute names with OpenTelemetry semantic conventions specification (#4769)
+
+### Dependencies
+
+- Updated various UI dependencies including @mui/material, @mui/x-charts, and development tools
+
 ## [2.1.3](https://github.com/flipt-io/flipt/releases/tag/v2.1.3) - 2025-09-24
 
 ### Fixed

CHANGELOG.md

@@ -0,0 +1,20 @@
+go 1.25.0
+
+// This go.work file is used by the Dagger build container to enable
+// multi-module workspace support. It allows commands like
+// 'go run ./build/internal/cmd/gitea/...' to work correctly from the
+// main module directory by making all submodules part of the workspace.
+//
+// This file is copied to go.work in the container during the build process.
+
+use (
+	.
+	./build
+	./core
+	./errors
+	./rpc/flipt
+	./rpc/v2/environments
+	./rpc/v2/evaluation
+	./sdk/go
+	./sdk/go/v2
+)

build/go.work.container

@@ -8,7 +8,6 @@ import (
 
 	"github.com/containerd/platforms"
 	"go.flipt.io/build/internal/dagger"
-	"golang.org/x/mod/modfile"
 )
 
 func Base(ctx context.Context, dag *dagger.Client, source, uiDist *dagger.Directory, platform platforms.Platform, registryCache ...string) (*dagger.Container, error) {
@@ -48,25 +47,26 @@ func Base(ctx context.Context, dag *dagger.Client, source, uiDist *dagger.Direct
 		}
 	}
 
-	goWork := source.File("go.work")
-	work, err := goWork.Contents(ctx)
-	if err != nil {
-		return nil, err
-	}
+	// Mount the main module's go.mod and go.sum
+	src := dag.Directory().
+		WithFile("go.mod", source.File("go.mod")).
+		WithFile("go.sum", source.File("go.sum"))
 
-	workFile, err := modfile.ParseWork("go.work", []byte(work), nil)
-	if err != nil {
-		return nil, err
+	// Mount submodule dependency files for all modules with replace directives
+	submodules := []string{
+		"build",
+		"core",
+		"errors",
+		"rpc/flipt",
+		"rpc/v2/environments",
+		"rpc/v2/evaluation",
+		"sdk/go",
+		"sdk/go/v2",
 	}
 
-	// infer mod and sum files from the contents of the work file.
-	src := dag.Directory().
-		WithFile("go.work", goWork).
-		WithFile("go.work.sum", source.File("go.work.sum"))
-
-	for _, use := range workFile.Use {
-		mod := path.Join(use.Path, "go.mod")
-		sum := path.Join(use.Path, "go.sum")
+	for _, submodule := range submodules {
+		mod := path.Join(submodule, "go.mod")
+		sum := path.Join(submodule, "go.sum")
 		src = src.
 			WithFile(mod, source.File(mod)).
 			WithFile(sum, source.File(sum))
@@ -98,6 +98,39 @@ func Base(ctx context.Context, dag *dagger.Client, source, uiDist *dagger.Direct
 
 	golang = golang.WithMountedDirectory(".", project)
 
+	// Create go.work file to enable multi-module support for tests
+	// that run commands in submodules (e.g., go run ./build/internal/cmd/gitea/...)
+	//
+	// Note: We inline the content here rather than copying from build/go.work.container
+	// to ensure it's always available regardless of mount ordering issues
+	goWorkContent := `go 1.25.0
+
+use (
+	.
+	./build
+	./core
+	./errors
+	./rpc/flipt
+	./rpc/v2/environments
+	./rpc/v2/evaluation
+	./sdk/go
+	./sdk/go/v2
+)
+`
+	golang = golang.WithNewFile("/src/go.work", goWorkContent, dagger.ContainerWithNewFileOpts{
+		Permissions: 0644,
+	})
+
+	// Sync the workspace to generate go.work.sum and validate the configuration
+	golang = golang.WithExec([]string{"go", "work", "sync"})
+
+	// Download dependencies for ALL workspace modules (now that workspace is configured)
+	// This ensures modules like 'build' have their dependencies available
+	golang = golang.WithExec([]string{"go", "mod", "download"})
+	if _, err := golang.Sync(ctx); err != nil {
+		return nil, fmt.Errorf("downloading workspace dependencies: %w", err)
+	}
+
 	// fetch and add ui/embed.go on its own
 	embed := dag.Directory().WithFiles("./ui", []*dagger.File{
 		source.File("./ui/dev.go"),

build/internal/flipt.go

@@ -135,6 +135,29 @@ func (f *Flipt) Test(
 			WithExec([]string{"apk", "add", "--no-cache", "bash", "git"}).
 			WithMountedDirectory("/src", source).
 			WithWorkdir("/src")
+
+		// Setup Go workspace for test execution
+		// This is needed for tests that run commands in submodules (e.g., go run ./build/internal/cmd/gitea/...)
+		goWorkContent := `go 1.25.0
+
+use (
+	.
+	./build
+	./core
+	./errors
+	./rpc/flipt
+	./rpc/v2/environments
+	./rpc/v2/evaluation
+	./sdk/go
+	./sdk/go/v2
+)
+`
+		f.BaseContainer = f.BaseContainer.
+			WithNewFile("/src/go.work", goWorkContent, dagger.ContainerWithNewFileOpts{
+				Permissions: 0644,
+			}).
+			WithExec([]string{"go", "work", "sync"}).
+			WithExec([]string{"go", "mod", "download"})
 	} else {
 		// Fall back to normal build process
 		flipt, err = f.Build(ctx, source, "", "")