Skip to content

Commit 38fe869

Browse files
committed
[make] Forcefully update dependency repos
1 parent 45a037f commit 38fe869

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tools/make/arm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ clone-sources-arm: ext/arm/cmsis/
1414
.PHONY: update-sources-arm
1515
## Update all ARM related repositories to the latest version.
1616
update-sources-arm:
17-
@(cd ext/arm/cmsis && git pull) &
17+
@(cd ext/arm/cmsis && git fetch && git reset --hard origin/master) &
1818
@wait
1919

tools/make/stmicro.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ clone-sources-stmicro: clone-sources-arm ext/stmicro/cubehal/ ext/stmicro/header
2727
.PHONY: update-sources-stmicro
2828
## Update all STMicro related repositories to the latest version.
2929
update-sources-stmicro: update-sources-arm
30-
@(cd ext/stmicro/cubehal && git pull) &
31-
@(cd ext/stmicro/header && git pull) &
32-
@(cd ext/stmicro/svd && git pull) &
33-
@(cd ext/stmicro/owl-archive && git pull) &
34-
@(cd ext/stmicro/svd-archive && git pull) &
30+
@(cd ext/stmicro/cubehal && git fetch && git reset --hard origin/main) &
31+
@(cd ext/stmicro/header && git fetch && git reset --hard origin/master) &
32+
@(cd ext/stmicro/svd && git fetch && git reset --hard origin/main) &
33+
@(cd ext/stmicro/owl-archive && git fetch && git reset --hard origin/main) &
34+
@(cd ext/stmicro/svd-archive && git fetch && git reset --hard origin/master) &
3535
@wait
3636

3737

@@ -71,9 +71,9 @@ clone-sources-stmicro-private: clone-sources-stmicro ext/stmicro/cubemx/ \
7171

7272
.PHONY: update-sources-stmicro-private
7373
update-sources-stmicro-private: update-sources-stmicro
74-
@(cd ext/stmicro/cubemx && git pull) &
75-
@(cd ext/stmicro/html-archive && git pull) &
76-
@(cd ext/stmicro/pdf && git pull) &
74+
@(cd ext/stmicro/cubemx && git fetch && git reset --hard origin/main) &
75+
@(cd ext/stmicro/html-archive && git fetch && git reset --hard origin/main) &
76+
@(cd ext/stmicro/pdf && git fetch && git reset --hard origin/main) &
7777
@wait
7878

7979

0 commit comments

Comments
 (0)