Skip to content

Commit d628e3e

Browse files
aykevldeadprogram
authored andcommitted
ci: don't add --recursive when updating submodules
It's not generally needed. It was added in #3958 to fix an issue with binaryen that has since been fixed in a different way, so we don't need the googletest dependency anymore.
1 parent d97e4db commit d628e3e

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ commands:
55
steps:
66
- run:
77
name: "Pull submodules"
8-
command: git submodule update --init --recursive
8+
command: git submodule update --init
99
llvm-source-linux:
1010
steps:
1111
- restore_cache:
@@ -33,13 +33,13 @@ commands:
3333
steps:
3434
- restore_cache:
3535
keys:
36-
- binaryen-linux-v2
36+
- binaryen-linux-v3
3737
- run:
3838
name: "Build Binaryen"
3939
command: |
4040
make binaryen
4141
- save_cache:
42-
key: binaryen-linux-v2
42+
key: binaryen-linux-v3
4343
paths:
4444
- build/wasm-opt
4545
test-linux:

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,13 +356,13 @@ jobs:
356356
uses: actions/cache@v4
357357
id: cache-binaryen
358358
with:
359-
key: binaryen-linux-${{ matrix.goarch }}-v3
359+
key: binaryen-linux-${{ matrix.goarch }}-v4
360360
path: build/wasm-opt
361361
- name: Build Binaryen
362362
if: steps.cache-binaryen.outputs.cache-hit != 'true'
363363
run: |
364364
sudo apt-get install --no-install-recommends ninja-build
365-
git submodule update --init --recursive lib/binaryen
365+
git submodule update --init lib/binaryen
366366
make CROSS=${{ matrix.toolchain }} binaryen
367367
- name: Install fpm
368368
run: |

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Now that we have a working static build, it's time to make a release tarball:
8585

8686
If you did not clone the repository with the `--recursive` option, you will get errors until you initialize the project submodules:
8787

88-
git submodule update --init --recursive
88+
git submodule update --init
8989

9090
The release tarball is stored in build/release.tar.gz, and can be extracted with
9191
the following command (for example in ~/lib):

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ COPY . /tinygo
2727

2828
# build the compiler and tools
2929
RUN cd /tinygo/ && \
30-
git submodule update --init --recursive && \
30+
git submodule update --init && \
3131
make gen-device -j4 && \
3232
make build/release
3333

GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ gen-device: gen-device-stm32
191191
endif
192192

193193
gen-device-avr:
194-
@if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init --recursive"; exit 1; fi
194+
@if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi
195195
$(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/
196196
./build/gen-device-avr lib/avr/packs/atmega src/device/avr/
197197
./build/gen-device-avr lib/avr/packs/tiny src/device/avr/
@@ -265,7 +265,7 @@ endif
265265
.PHONY: wasi-libc
266266
wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
267267
lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
268-
@if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init --recursive"; exit 1; fi
268+
@if [ ! -e lib/wasi-libc/Makefile ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi
269269
cd lib/wasi-libc && $(MAKE) -j4 EXTRA_CFLAGS="-O2 -g -DNDEBUG -mnontrapping-fptoint -msign-ext" MALLOC_IMPL=none CC="$(CLANG)" AR=$(LLVM_AR) NM=$(LLVM_NM)
270270

271271
# Check for Node.js used during WASM tests.

flake.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#
1919
# But you'll need a bit more to make TinyGo actually able to compile code:
2020
#
21-
# make llvm-source # fetch compiler-rt
22-
# git submodule update --init --recursive # fetch lots of other libraries and SVD files
23-
# make gen-device -j4 # build src/device/*/*.go files
24-
# make wasi-libc # build support for wasi/wasm
21+
# make llvm-source # fetch compiler-rt
22+
# git submodule update --init # fetch lots of other libraries and SVD files
23+
# make gen-device -j4 # build src/device/*/*.go files
24+
# make wasi-libc # build support for wasi/wasm
2525
#
2626
# With this, you should have an environment that can compile anything - except
2727
# for the Xtensa architecture (ESP8266/ESP32) because support for that lives in

hooks/post_checkout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
# Docker hub does a recursive clone, then checks the branch out,
33
# so when a PR adds a submodule (or updates it), it fails.
4-
git submodule update --init --recursive
4+
git submodule update --init

0 commit comments

Comments
 (0)