Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/mobile_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: echo "LANG=en_US.UTF-8" >> $GITHUB_ENV

- name: Tests
run: xvfb-run go test -race -tags mobile,ci,migrated_fynedo ./...
run: xvfb-run go test -race -tags mobile,ci ./...

- name: Compile
working-directory: cmd/fyne_demo
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/platform_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
include:
- os: ubuntu-latest
runner: xvfb-run
tags: ci,migrated_fynedo
tags: ci
cover: -covermode=atomic -coverprofile=coverage.out
- os: macos-latest
tags: no_glfw,ci,migrated_fynedo
tags: no_glfw,ci
- os: windows-latest
tags: no_glfw,migrated_fynedo
tags: no_glfw

steps:
- uses: actions/checkout@v5
Expand Down
4 changes: 2 additions & 2 deletions cmd/fyne/internal/commands/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ func (b *Builder) build() error {
if b.release {
tags = append(tags, "release")
}
if ok, set := b.Migrations["fyneDo"]; ok && set {
tags = append(tags, "migrated_fynedo")
if ok, set := b.Migrations["fyneDo"]; ok && !set {
tags = append(tags, "legacy_threading")
}
if len(tags) > 0 {
args = append(args, "-tags", strings.Join(tags, ","))
Expand Down
2 changes: 1 addition & 1 deletion internal/async/map.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !migrated_fynedo
//go:build legacy_threading

package async

Expand Down
2 changes: 1 addition & 1 deletion internal/async/map_clear.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !go1.23 && !migrated_fynedo
//go:build !go1.23 && legacy_threading

package async

Expand Down
2 changes: 1 addition & 1 deletion internal/async/map_clear_go1.23.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build go1.23 && !migrated_fynedo
//go:build go1.23 && legacy_threading

package async

Expand Down
2 changes: 1 addition & 1 deletion internal/async/map_migratedfynedo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build migrated_fynedo
//go:build !legacy_threading

package async

Expand Down
2 changes: 1 addition & 1 deletion internal/async/queue.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !migrated_fynedo
//go:build legacy_threading

package async

Expand Down
2 changes: 1 addition & 1 deletion internal/async/queue_migratedfynedo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build migrated_fynedo
//go:build !legacy_threading

package async

Expand Down Expand Up @@ -56,5 +56,5 @@

// Len returns the number of items in the queue.
func (q *CanvasObjectQueue) Len() uint64 {
return uint64(q.size)

Check failure on line 59 in internal/async/queue_migratedfynedo.go

View workflow job for this annotation

GitHub Actions / static_analysis (macos-latest)

G115: integer overflow conversion int -> uint64 (gosec)

Check failure on line 59 in internal/async/queue_migratedfynedo.go

View workflow job for this annotation

GitHub Actions / static_analysis (ubuntu-latest)

G115: integer overflow conversion int -> uint64 (gosec)
}
2 changes: 1 addition & 1 deletion internal/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
var (
migrateCheck sync.Once

migratedFyneDo bool
migratedFyneDo bool = true
)

func MigratedToFyneDo() bool {
Expand Down
2 changes: 1 addition & 1 deletion internal/build/migrated_fynedo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build migrated_fynedo
//go:build !legacy_threading

package build

Expand Down
2 changes: 1 addition & 1 deletion internal/build/migrated_notfynedo.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//go:build !migrated_fynedo
//go:build legacy_threading

package build

Expand Down
Loading