Skip to content

Commit c0f847e

Browse files
Automator: update common-files@master in istio/api@master (#3105)
1 parent 183b345 commit c0f847e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9f064a680dc69e212c42e23af3e7d025fe21d9ef
1+
689b33f2ec2fe303ad3f11ec18b65311070acaa6

common/Makefile.common.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,16 @@ update-common:
101101
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/$(BUILD_TOOLS_ORG)/common-files $(TMP)/common-files
102102
@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
103103
@rm -fr common
104+
# istio/community has its own CONTRIBUTING.md file.
104105
@CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md)
105106
@if [ "$(CONTRIB_OVERRIDE)" != "CONTRIBUTING.md" ]; then\
106107
rm $(TMP)/common-files/files/CONTRIBUTING.md;\
107108
fi
109+
# istio/istio.io uses the Creative Commons Attribution 4.0 license. Don't update LICENSE with the common Apache license.
110+
@LICENSE_OVERRIDE=$(shell grep -l "Creative Commons Attribution 4.0 International Public License" LICENSE)
111+
@if [ "$(LICENSE_OVERRIDE)" != "LICENSE" ]; then\
112+
rm $(TMP)/common-files/files/LICENSE;\
113+
fi
108114
@cp -a $(TMP)/common-files/files/* $(TMP)/common-files/files/.devcontainer $(TMP)/common-files/files/.gitattributes $(shell pwd)
109115
@rm -fr $(TMP)/common-files
110116
@$(or $(COMMONFILES_POSTPROCESS), true)

0 commit comments

Comments
 (0)