Skip to content
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.

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

Tidy up #187

Merged
merged 3 commits into from
Mar 8, 2024
Merged
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/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
{
"name": "Protobuf generation",
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
},
{
"name": "Embedded asset generation",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-requests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
{
"name": "Protobuf generation",
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
"run": "find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true\nbazel build $(bazel query --output=label 'kind(\"go_proto_library\", //...)')\nfind bazel-bin/pkg/proto -name '*.pb.go' | while read f; do\n cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')\ndone\n"
},
{
"name": "Embedded asset generation",
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ http_archive(

http_archive(
name = "aspect_rules_js",
sha256 = "00e7b97b696af63812df0ca9e9dbd18579f3edd3ab9a56f227238b8405e4051c",
strip_prefix = "rules_js-1.23.0",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.23.0/rules_js-v1.23.0.tar.gz",
sha256 = "edc7b0255114fafdbbd593ea5d5fdfd54b2a603f33b3a49518910ac618e1bf2b",
strip_prefix = "rules_js-1.38.0",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.38.0/rules_js-v1.38.0.tar.gz",
)

load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
Expand Down
2 changes: 1 addition & 1 deletion pkg/filesystem/local_directory_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ func createNTFSHardlink(oldHandle windows.Handle, oldName string, newHandle wind
func renameHelper(sourceHandle, newHandle windows.Handle, newName string) (areSame bool, err error) {
// We want to know a few things before renaming:
// 1. Are source and target hard links to the same file? If so, noop.
// 2. If target exists and wither source or target is a directory, don't overwrite and report error.
// 2. If target exists and whether source or target is a directory, don't overwrite and report error.
// 3. If neither is the case, move and, if necessary, replace.
var targetHandle windows.Handle
err = ntCreateFile(&targetHandle, windows.FILE_READ_ATTRIBUTES, newHandle, newName, windows.FILE_OPEN,
Expand Down
2 changes: 1 addition & 1 deletion pkg/filesystem/path/component_walker.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type GotSymlink struct {

// GotDirectoryOrSymlink is a union type of GotDirectory and GotSymlink.
// It is returned by ComponentWalker.OnDirectory(), as that function may
// return either a direcgory or symbolic link.
// return either a directory or symbolic link.
type GotDirectoryOrSymlink interface {
isGotDirectoryOrSymlink()
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/non_empty_stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (cw *NonEmptyStack[T]) Push(d T) {

// PopSingle removes the last pushed element from the stack. The return
// value indicates whether an element was popped successfully. It is not
// possible to push the final element off the stack.
// possible to pop the final element off the stack.
func (cw *NonEmptyStack[T]) PopSingle() (T, bool) {
if len(cw.stack) == 1 {
var zero T
Expand Down
2 changes: 1 addition & 1 deletion tools/github_workflows/workflows_template.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
name: 'Protobuf generation',
run: |||
find . bazel-bin/pkg/proto -name '*.pb.go' -delete || true
bazel build $(bazel query 'kind("go_proto_library", //...)')
bazel build $(bazel query --output=label 'kind("go_proto_library", //...)')
find bazel-bin/pkg/proto -name '*.pb.go' | while read f; do
cat $f > $(echo $f | sed -e 's|.*/pkg/proto/|pkg/proto/|')
done
Expand Down