Skip to content

simplify makefile#6893

Open
feederbox826 wants to merge 3 commits intostashapp:developfrom
feederbox826:make-fix
Open

simplify makefile#6893
feederbox826 wants to merge 3 commits intostashapp:developfrom
feederbox826:make-fix

Conversation

@feederbox826
Copy link
Copy Markdown
Member

@feederbox826 feederbox826 commented May 6, 2026

struggled tremendously to get this working properly with homebrew

notable changes

  • added "dependency files" instead of trying to chain together ui/generate
    • this drops touch-ui as a hard dependency and will build properly instead
  • replace npm run with pnpm run
  • drop build-release from install, use static name

fixes #6877

@WithoutPants
Copy link
Copy Markdown
Collaborator

#6877 doesn't actually fix #5674, and is not fixed in this branch either.

Running make -j 4 release on develop I get the following output:

cd ui/v2.5 && pnpm install --frozen-lockfile
make: Circular ui-only <- ui dependency dropped.
go generate ./ui
go build  -v -tags "sqlite_stat4 sqlite_math_functions" -trimpath -buildmode=pie -ldflags "-s -w -X 'github.com/stashapp/stash/internal/build.buildstamp=2026-05-08 09:35:01' -X 'github.com/stashapp/stash/internal/build.githash=01a758336' -X 'github.com/stashapp/stash/internal/build.version=v0.31.1-46-g01a758336' -X 'github.com/stashapp/stash/internal/build.officialBuild=false'" ./cmd/stash
Generating login locales
go generate ./cmd/stash
github.com/stashapp/stash/ui
github.com/stashapp/stash/internal/manager
Lockfile is up to date, resolution step is skipped
Already up to date
github.com/stashapp/stash/internal/api
# github.com/stashapp/stash/internal/api
open internal/api/generated_exec.go: no such file or directory
make: *** [Makefile:123: stash] Error 1
make: *** Waiting for unfinished jobs....
Done in 1s using pnpm v10.33.0

On this branch, running make -j 4 release works, but it's running the go build and the UI build concurrently, so changes to the UI may not make it into the binary output. I could address this by adding ui/v2.5/build/index.html to the stash target, but then the build target would always do the UI build, even if the UI source files hadn't been updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants