mirror of https://github.com/k3s-io/k3s.git
Merge pull request #106 from jbeda/third-party-move
Move third_party code under third_party/src so it can be used in $GOPATHpull/6/head
commit
e43624e096
|
@ -53,7 +53,7 @@ KUBE_GO_PACKAGE_DIR="${GOPATH}/src/${KUBE_GO_PACKAGE}"
|
|||
fi
|
||||
|
||||
rm "${PACKAGE_DIR}" >/dev/null 2>&1 || true
|
||||
ln -s "${THIRD_PARTY_BASE}/${p}" "${PACKAGE_DIR}"
|
||||
ln -s "${THIRD_PARTY_BASE}/src/${p}" "${PACKAGE_DIR}"
|
||||
done
|
||||
|
||||
for p in ${PACKAGES}; do
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
errors=0
|
||||
for file in $(git diff --cached --name-only | grep "\.go"); do
|
||||
for file in $(git diff --cached --name-only --diff-filter ACM | grep "\.go" | grep -v "third_party"); do
|
||||
diff="$(git show ":${file}" | gofmt -s -d)"
|
||||
if [[ -n "$diff" ]]; then
|
||||
echo "# *** ERROR: *** File ${file} has not been gofmt'd." >> $1
|
||||
|
|
|
@ -40,7 +40,7 @@ mkdir -p $MASTER_RELEASE_DIR/third_party/go
|
|||
echo "Building release tree"
|
||||
cp release/master-release-install.sh $MASTER_RELEASE_DIR/src/scripts/master-release-install.sh
|
||||
cp -r cluster/saltbase $MASTER_RELEASE_DIR/src/saltbase
|
||||
cp -r third_party $MASTER_RELEASE_DIR/third_party/go/src
|
||||
cp -r third_party/src $MASTER_RELEASE_DIR/third_party/go/src
|
||||
|
||||
function find_go_files() {
|
||||
find * -not \( \
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue