diff --git a/.github/workflows/build-and-test-v3.yml b/.github/workflows/build-and-test-v3.yml index 14b2fb5f4a2..82dfa8d1bf8 100644 --- a/.github/workflows/build-and-test-v3.yml +++ b/.github/workflows/build-and-test-v3.yml @@ -7,9 +7,6 @@ on: - master paths: - 'v3/**' - - 'webview2/**' - - 'go.work' - - 'go.work.sum' - '.github/workflows/build-and-test-v3.yml' pull_request_review: types: [submitted] @@ -126,8 +123,6 @@ jobs: cache: true cache-dependency-path: | v3/go.sum - webview2/go.sum - go.work.sum - name: Install Task uses: arduino/setup-task@v2 @@ -237,8 +232,6 @@ jobs: cache: true cache-dependency-path: | v3/go.sum - webview2/go.sum - go.work.sum - name: Install Task uses: arduino/setup-task@v2 @@ -274,9 +267,6 @@ jobs: # Replace @wailsio/runtime version with local tarball npm pkg set dependencies.@wailsio/runtime="file://$RUNTIME_TGZ" cd .. - # Register the generated project in the workspace so Go 1.25 workspace - # mode does not reject packages in a module not listed in go.work. - go work use . wails3 build # GTK3 legacy template builds are covered by the Go example compilation tests above. diff --git a/.github/workflows/cross-compile-test-v3.yml b/.github/workflows/cross-compile-test-v3.yml index fd774bef49b..bd2c42a0a3f 100644 --- a/.github/workflows/cross-compile-test-v3.yml +++ b/.github/workflows/cross-compile-test-v3.yml @@ -7,9 +7,6 @@ on: - master paths: - 'v3/**' - - 'webview2/**' - - 'go.work' - - 'go.work.sum' - '.github/workflows/cross-compile-test-v3.yml' workflow_dispatch: inputs: @@ -82,8 +79,6 @@ jobs: cache: true cache-dependency-path: | v3/go.sum - webview2/go.sum - go.work.sum - name: Install Task uses: arduino/setup-task@v2 diff --git a/.gitignore b/.gitignore index 61efe756b07..c1b4664c5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,7 @@ v2/cmd/wails/internal/commands/initialise/templates/testtemplates/ # Ignore local iOS test app /v3/testiosapp/ + +# Local Go workspaces are a per-developer concern, not part of the source +go.work +go.work.sum diff --git a/go.work b/go.work deleted file mode 100644 index 1fbc5f094c4..00000000000 --- a/go.work +++ /dev/null @@ -1,5 +0,0 @@ -go 1.25.0 - -use ( - ./v3 -) diff --git a/go.work.sum b/go.work.sum deleted file mode 100644 index 91461c0a1f5..00000000000 --- a/go.work.sum +++ /dev/null @@ -1,41 +0,0 @@ -cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc= -github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= -github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/caarlos0/go-version v0.2.2/go.mod h1:X+rI5VAtJDpcjCjeEIXpxGa5+rTcgur1FK66wS0/944= -github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao= -github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= -github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/muesli/mango v0.2.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4= -github.com/muesli/mango-cobra v1.3.0/go.mod h1:Cj1ZrBu3806Qw7UjxnAUgE+7tllUBj1NCLQDwwGx19E= -github.com/muesli/mango-pflag v0.1.0/go.mod h1:YEQomTxaCUp8PrbhFh10UfbhbQrM/xJ4i2PB8VTLLW0= -github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= -github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= -github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= -github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= -github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= -github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= -github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY= -github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw= -golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE= -golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= -golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated/go.mod h1:RVAQXBGNv1ib0J382/DPCRS/BPnsGebyM1Gj5VSDpG8= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -mvdan.cc/editorconfig v0.3.0/go.mod h1:NcJHuDtNOTEJ6251indKiWuzK6+VcrMuLzGMLKBFupQ= diff --git a/v3/examples/mac-window-tabs/Taskfile.yml b/v3/examples/mac-window-tabs/Taskfile.yml index bba79236acc..6a06761e83a 100644 --- a/v3/examples/mac-window-tabs/Taskfile.yml +++ b/v3/examples/mac-window-tabs/Taskfile.yml @@ -8,12 +8,12 @@ includes: # This example is a standalone Go module (its own go.mod, with a `replace` # pointing at the local Wails checkout because MacWindowTabbingMode is not in a -# published release yet). It physically lives under v3/, which is a member of -# the repo's root go.work. An active workspace would shadow this module: binding -# generation would find 0 services and `go mod tidy` would target v3 instead. -# Force workspace mode off so the example always builds as itself. This is -# inherited by the wails3 dev/build subprocess tree and is a harmless no-op -# outside the monorepo, where there is no go.work. +# published release yet). It physically lives under v3/, so any go.work that +# covers v3 would shadow this module: binding generation would find 0 services +# and `go mod tidy` would target v3 instead. The repo no longer ships a +# workspace file, but contributors often create one locally, so force workspace +# mode off and the example always builds as itself. This is inherited by the +# wails3 dev/build subprocess tree and is a harmless no-op everywhere else. env: GOWORK: "off" diff --git a/v3/examples/mac-window-tabs/build/Taskfile.yml b/v3/examples/mac-window-tabs/build/Taskfile.yml index 9322dc9c3be..b09e92f7560 100644 --- a/v3/examples/mac-window-tabs/build/Taskfile.yml +++ b/v3/examples/mac-window-tabs/build/Taskfile.yml @@ -1,9 +1,10 @@ version: '3' # See the note in ../Taskfile.yml: this example is a standalone module nested -# under v3/, so an active go.work would shadow it. Force workspace mode off here -# too, so the Go-tooling tasks (go mod tidy, generate bindings, go build) behave -# correctly even when invoked directly rather than via the root dev/build tasks. +# under v3/, so a local go.work covering v3 would shadow it. Force workspace +# mode off here too, so the Go-tooling tasks (go mod tidy, generate bindings, +# go build) behave correctly even when invoked directly rather than via the +# root dev/build tasks. env: GOWORK: "off"