From 29e7a9dbbe4ecbfa91b042955c7be355a2cebbbe Mon Sep 17 00:00:00 2001 From: Istio Automation Date: Fri, 1 Mar 2024 12:19:36 -0800 Subject: [PATCH] Automator: update common-files@master in istio/istio.io@master (#14673) --- common/.commonfiles.sha | 2 +- common/Makefile.common.mk | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 5b2dffabbf..18e0161a6b 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -9f064a680dc69e212c42e23af3e7d025fe21d9ef +689b33f2ec2fe303ad3f11ec18b65311070acaa6 diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index 617da2607a..89de83345a 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -101,10 +101,16 @@ update-common: @git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/$(BUILD_TOOLS_ORG)/common-files $(TMP)/common-files @cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha @rm -fr common +# istio/community has its own CONTRIBUTING.md file. @CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md) @if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\ rm $(TMP)/common-files/files/CONTRIBUTING.md;\ fi +# istio/istio.io uses the Creative Commons Attribution 4.0 license. Don't update LICENSE with the common Apache license. + @LICENSE_OVERRIDE=$(shell grep -l "Creative Commons Attribution 4.0 International Public License" LICENSE) + @if [ "$(LICENSE_OVERRIDE)" != "LICENSE" ]; then\ + rm $(TMP)/common-files/files/LICENSE;\ + fi @cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd) @rm -fr $(TMP)/common-files @$(or $(COMMONFILES_POSTPROCESS), true)