Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
2edd1070
Unverified
Commit
2edd1070
authored
Jun 25, 2018
by
Christoph Blecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix run-in-gopath issue with symlink'd gopath
parent
67e7d4c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
init.sh
hack/lib/init.sh
+0
-1
update-bazel.sh
hack/update-bazel.sh
+5
-6
No files found.
hack/lib/init.sh
View file @
2edd1070
...
@@ -178,4 +178,3 @@ kube::realpath() {
...
@@ -178,4 +178,3 @@ kube::realpath() {
fi
fi
kube::readlinkdashf
"
$1
"
kube::readlinkdashf
"
$1
"
}
}
hack/update-bazel.sh
View file @
2edd1070
...
@@ -20,8 +20,6 @@ set -o pipefail
...
@@ -20,8 +20,6 @@ set -o pipefail
export
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/..
export
KUBE_ROOT
=
$(
dirname
"
${
BASH_SOURCE
}
"
)
/..
source
"
${
KUBE_ROOT
}
/hack/lib/init.sh"
source
"
${
KUBE_ROOT
}
/hack/lib/init.sh"
kube::util::ensure-gnu-sed
# Remove generated files prior to running kazel.
# Remove generated files prior to running kazel.
# TODO(spxtr): Remove this line once Bazel is the only way to build.
# TODO(spxtr): Remove this line once Bazel is the only way to build.
rm
-f
"
${
KUBE_ROOT
}
/pkg/generated/openapi/zz_generated.openapi.go"
rm
-f
"
${
KUBE_ROOT
}
/pkg/generated/openapi/zz_generated.openapi.go"
...
@@ -31,9 +29,8 @@ export GOBIN="${KUBE_OUTPUT_BINPATH}"
...
@@ -31,9 +29,8 @@ export GOBIN="${KUBE_OUTPUT_BINPATH}"
PATH
=
"
${
GOBIN
}
:
${
PATH
}
"
PATH
=
"
${
GOBIN
}
:
${
PATH
}
"
# Install tools we need, but only from vendor/...
# Install tools we need, but only from vendor/...
go
install
./vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
go
install
k8s.io/kubernetes/vendor/github.com/bazelbuild/bazel-gazelle/cmd/gazelle
go
install
k8s.io/kubernetes/vendor/github.com/kubernetes/repo-infra/kazel
go
install
./vendor/github.com/kubernetes/repo-infra/kazel
touch
"
${
KUBE_ROOT
}
/vendor/BUILD"
touch
"
${
KUBE_ROOT
}
/vendor/BUILD"
# Ensure that we use the correct importmap for all vendored dependencies.
# Ensure that we use the correct importmap for all vendored dependencies.
...
@@ -46,6 +43,8 @@ fi
...
@@ -46,6 +43,8 @@ fi
gazelle fix
\
gazelle fix
\
-build_file_name
=
BUILD,BUILD.bazel
\
-build_file_name
=
BUILD,BUILD.bazel
\
-external
=
vendored
\
-external
=
vendored
\
-mode
=
fix
-mode
=
fix
\
-repo_root
"
${
KUBE_ROOT
}
"
\
"
${
KUBE_ROOT
}
"
kazel
kazel
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment