Automator: update common-files@master in istio/api@master (#3105)

istio · Mar 1, 2024 · c0f847e · c0f847e
1 parent 183b345
commit c0f847e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-9f064a680dc69e212c42e23af3e7d025fe21d9ef
+689b33f2ec2fe303ad3f11ec18b65311070acaa6
diff --git 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)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9f064a680dc69e212c42e23af3e7d025fe21d9ef
		689b33f2ec2fe303ad3f11ec18b65311070acaa6