From 6c850349528c4da31141ff0d6a6b90b01e4cb901 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Tue, 25 Apr 2023 15:16:42 -0600 Subject: [PATCH 1/2] Bump recommended shallow-since 1.5 years forward --- py/makeversionhdr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 6576c3abbb..21ad92f1d8 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -66,7 +66,7 @@ def cannot_determine_version(): CircuitPython must be built from a git clone with tags. If you cloned from a fork, fetch the tags from adafruit/circuitpython as follows: - git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD""" + git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD""" ) From 863042dfd0abebba04be242b33b6f1a4f5d6bab5 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Tue, 25 Apr 2023 16:05:20 -0600 Subject: [PATCH 2/2] Move git command to update necessary tags to submodule I ran into this one since I did an initial shallow clone due to slow pycon 2023 wifi. --- Makefile | 4 ++++ py/makeversionhdr.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0f1fcb3d0..d611dff49d 100644 --- a/Makefile +++ b/Makefile @@ -345,3 +345,7 @@ fetch-submodules: remove-submodules: git submodule deinit -f --all rm -rf .git/modules/* + +.PHONY: fetch-tags +fetch-tags: + git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 21ad92f1d8..b0d00a694e 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -66,7 +66,7 @@ def cannot_determine_version(): CircuitPython must be built from a git clone with tags. If you cloned from a fork, fetch the tags from adafruit/circuitpython as follows: - git fetch --tags --recurse-submodules=no --shallow-since="2023-02-01" https://github.com/adafruit/circuitpython HEAD""" + make fetch-tags""" )