Skip to content

fix(Makefile): fix dcspec gen dependencies and hide error output #17043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

fix(Makefile): fix dcspec gen dependencies and hide error output #17043

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c10190
fix(Makefile): fix dcspec gen dependencies and hide error output
mafredri Mar 21, 2025
cc0f78b
fix pnpm dependency when building dylib
mafredri Mar 24, 2025
feffa14
MOST_GO_SRC_FILES~
mafredri Mar 24, 2025
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
Prev Previous commit
Next Next commit
fix pnpm dependency when building dylib
  • Loading branch information
@mafredri
mafredri committed Mar 24, 2025
commit cc0f78bbec03dce705928a1d1c5b9adc4d8eae75
6 changes: 6 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,12 @@ jobs:
set -euxo pipefail
go mod download

# The "build/coder-dylib" target depends on all Go source files and
# the target "agent/agentcontainers/dcspec/dcspec_gen.go" depends on
# node/pnpm tooling.
mkdir -p node_modules
touch node_modules/.installed
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @deansheather lmk if you're unhappy about this change. Happy to solve this another way if you have a suggestion. I'm vary of allowing gen/mark-fresh to touch non-existent files (node_modules/.installed).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a new GO_SRC_FILES-adjacent variable that excludes this directory perhaps?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can do that 👍🏻. It seems the vpn package is limited to importing codersdk and tailnet (+ sub paths), would it be alright to limit it to these or should we have a more exhaustive selection of src files?

(It'd be nice to eventually partially generate the Makefile and/or use Go src parsing to include relevant src files for targets.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine to just exclude the problematic files for now. Even though it only imports those packages, those packages import a lot more.

Copy link
Member Author

@mafredri mafredri Mar 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, wdyt ef77ec5 (#17043)?


make gen/mark-fresh
make build/coder-dylib
env:
Expand Down
Loading