Skip to content
This repository was archived by the owner on Sep 5, 2019. It is now read-only.

Use library.sh from prow-tests image, instead of yet another copy of it #272

Merged
google-prow-robot merged 1 commit into from
Jul 20, 2018
Merged

Use library.sh from prow-tests image, instead of yet another copy of it #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions hack/verify-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

source "$(dirname $(readlink -f ${BASH_SOURCE}))/../test/library.sh"

set -o errexit
set -o nounset
set -o pipefail

readonly BUILD_ROOT_DIR="$(git rev-parse --show-toplevel)"
readonly TMP_DIFFROOT="$(mktemp -d -p ${BUILD_ROOT_DIR})"

cleanup() {
rm -rf "${TMP_DIFFROOT}"
}
Expand All @@ -37,7 +36,7 @@ cp -aR "${BUILD_ROOT_DIR}/Gopkg.lock" "${BUILD_ROOT_DIR}/pkg" "${BUILD_ROOT_DIR}
"${BUILD_ROOT_DIR}/hack/update-codegen.sh"
echo "Diffing ${BUILD_ROOT_DIR} against freshly generated codegen"
ret=0
diff -Naupr "${BUILD_ROOT_DIR}/pkg" "${TMP_DIFFROOT}/pkg" || ret=$?
diff -Naupr "${BUILD_ROOT_DIR}/pkg" "${TMP_DIFFROOT}/pkg" || ret=1

# Restore working tree state
rm -fr "${BUILD_ROOT_DIR}/Gopkg.lock" "${BUILD_ROOT_DIR}/pkg" "${BUILD_ROOT_DIR}/vendor"
Expand Down
83 changes: 0 additions & 83 deletions test/library.sh
View file
Open in desktop

This file was deleted.