istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to -o pipefail and fix lint-yaml, revert istio commit (#8254) 

* Revert to -o pipefile

* Add +o pipefail around common file lint-yaml

* Update comment

* Simplify call

* Revert to older istio/istio commit which passed tests
This commit is contained in:
Eric Van Norman 2020-10-02 10:02:49 -05:00 committed by GitHub
parent c3a3c5df0b
commit 87ce923716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.core.mk
View File

@ -99,13 +99,18 @@ opt:
clean:
@rm -fr resources .htmlproofer tmp generated public out samples install go tests/integration/ manifests
lint: clean_public build_nominify lint-copyright-banner lint-python lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
# Use docs-lint-yaml as a target around the common-files lint-yaml, but set +o pipefail for that call
# otherwise it fails.
docs-lint-yaml:
@set +o pipefail; $(MAKE) -f common/Makefile.common.mk lint-yaml
lint: clean_public build_nominify lint-copyright-banner lint-python docs-lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
@scripts/lint_site.sh
lint-en: clean_public build_nominify lint-copyright-banner lint-python lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
lint-en: clean_public build_nominify lint-copyright-banner lint-python docs-lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
@scripts/lint_site.sh en
lint-fast: clean_public build_nominify lint-copyright-banner lint-python lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
lint-fast: clean_public build_nominify lint-copyright-banner lint-python docs-lint-yaml lint-dockerfiles lint-scripts lint-sass lint-typescript lint-go
@SKIP_LINK_CHECK=true scripts/lint_site.sh en
serve: site
@ -196,9 +201,6 @@ test.kube.postsubmit: test.kube.presubmit
test_status:
@scripts/test_status.sh
# make lint-yaml seems to fail with pipefail, so remove now.
SHELL = /bin/bash
include common/Makefile.common.mk
.PHONY: site gen build build_nominify opt clean_public clean lint serve netlify_install netlify netlify_archive archive update_ref_docs update_operator_yamls update_examples update_all

2
go.mod
View File

@ -27,6 +27,6 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
replace github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
require (
istio.io/istio v0.0.0-20200929203328-23d758a01659
istio.io/istio v0.0.0-20200923202757-05a7bf75cd95
istio.io/pkg v0.0.0-20200922180714-670b76a68558
)

8
go.sum
View File

@ -1233,15 +1233,15 @@ honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
istio.io/api v0.0.0-20190515205759-982e5c3888c6/go.mod h1:hhLFQmpHia8zgaM37vb2ml9iS5NfNfqZGRt1pS9aVEo=
istio.io/api v0.0.0-20200812202721-24be265d41c3/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
istio.io/api v0.0.0-20200929181739-00671adacbea h1:8s6ZO9pjYooJoeNaU6BUPwo5EJjQh6MDtkjgqBX60Cw=
istio.io/api v0.0.0-20200929181739-00671adacbea/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
istio.io/api v0.0.0-20200922140055-482a96e7a99d h1:ObXl1UxA++Mu6uNDuTdr2c/rLm5FFoUCqEIHDm73w7c=
istio.io/api v0.0.0-20200922140055-482a96e7a99d/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
istio.io/client-go v0.0.0-20200908160912-f99162621a1a h1:clPn0fz+rXq5Ytj6Ppb1ygUKeU0RImT4ZbT1oMd1G04=
istio.io/client-go v0.0.0-20200908160912-f99162621a1a/go.mod h1:SO65MWt7I45dvUwuDowoiB0SVcGpfWZfUTlopvYpbZc=
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
istio.io/gogo-genproto v0.0.0-20200908160912-66171252e3db h1:btPv5pCusFxbWrmiLNLEThH8IzWunUeZ1r5M1O22vBc=
istio.io/gogo-genproto v0.0.0-20200908160912-66171252e3db/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
istio.io/istio v0.0.0-20200929203328-23d758a01659 h1:lkJVrgjD/zLf568EXRCPsjub2RtpopYEpc4BPF/Fx5o=
istio.io/istio v0.0.0-20200929203328-23d758a01659/go.mod h1:qMzD9IdBWjV0sjQug3Iaoy9VCH9o+Bdy1irzzJiUpLo=
istio.io/istio v0.0.0-20200923202757-05a7bf75cd95 h1:uK7oV0zeoH0A9kfE7ZuQW0RakgR18szuvO9x/dbmrWY=
istio.io/istio v0.0.0-20200923202757-05a7bf75cd95/go.mod h1:yIaKhY/aZtdY+ZAksLR79DnWu976B4LXJE2+7kqrNQE=
istio.io/pkg v0.0.0-20200922180714-670b76a68558 h1:ATDshla3gX4b0X8oMs0rrFry9qJshrzTnFkBV42CcFk=
istio.io/pkg v0.0.0-20200922180714-670b76a68558/go.mod h1:p6wktGBjkjL3spRSsyfOh0XkuKb8IuBX61rERHfmSbU=
k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8=