mirror of
https://github.com/tinygo-org/tinygo.git
synced 2026-08-11 22:43:40 +00:00
ci: don't add --recursive when updating submodules
It's not generally needed. It was added in https://github.com/tinygo-org/tinygo/pull/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.
This commit is contained in:
committed by
Ron Evans
parent
d97e4dbccf
commit
d628e3e2cb
@@ -5,7 +5,7 @@ commands:
|
|||||||
steps:
|
steps:
|
||||||
- run:
|
- run:
|
||||||
name: "Pull submodules"
|
name: "Pull submodules"
|
||||||
command: git submodule update --init --recursive
|
command: git submodule update --init
|
||||||
llvm-source-linux:
|
llvm-source-linux:
|
||||||
steps:
|
steps:
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
@@ -33,13 +33,13 @@ commands:
|
|||||||
steps:
|
steps:
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
keys:
|
keys:
|
||||||
- binaryen-linux-v2
|
- binaryen-linux-v3
|
||||||
- run:
|
- run:
|
||||||
name: "Build Binaryen"
|
name: "Build Binaryen"
|
||||||
command: |
|
command: |
|
||||||
make binaryen
|
make binaryen
|
||||||
- save_cache:
|
- save_cache:
|
||||||
key: binaryen-linux-v2
|
key: binaryen-linux-v3
|
||||||
paths:
|
paths:
|
||||||
- build/wasm-opt
|
- build/wasm-opt
|
||||||
test-linux:
|
test-linux:
|
||||||
|
|||||||
@@ -356,13 +356,13 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
id: cache-binaryen
|
id: cache-binaryen
|
||||||
with:
|
with:
|
||||||
key: binaryen-linux-${{ matrix.goarch }}-v3
|
key: binaryen-linux-${{ matrix.goarch }}-v4
|
||||||
path: build/wasm-opt
|
path: build/wasm-opt
|
||||||
- name: Build Binaryen
|
- name: Build Binaryen
|
||||||
if: steps.cache-binaryen.outputs.cache-hit != 'true'
|
if: steps.cache-binaryen.outputs.cache-hit != 'true'
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install --no-install-recommends ninja-build
|
sudo apt-get install --no-install-recommends ninja-build
|
||||||
git submodule update --init --recursive lib/binaryen
|
git submodule update --init lib/binaryen
|
||||||
make CROSS=${{ matrix.toolchain }} binaryen
|
make CROSS=${{ matrix.toolchain }} binaryen
|
||||||
- name: Install fpm
|
- name: Install fpm
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
+1
-1
@@ -85,7 +85,7 @@ Now that we have a working static build, it's time to make a release tarball:
|
|||||||
|
|
||||||
If you did not clone the repository with the `--recursive` option, you will get errors until you initialize the project submodules:
|
If you did not clone the repository with the `--recursive` option, you will get errors until you initialize the project submodules:
|
||||||
|
|
||||||
git submodule update --init --recursive
|
git submodule update --init
|
||||||
|
|
||||||
The release tarball is stored in build/release.tar.gz, and can be extracted with
|
The release tarball is stored in build/release.tar.gz, and can be extracted with
|
||||||
the following command (for example in ~/lib):
|
the following command (for example in ~/lib):
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ COPY . /tinygo
|
|||||||
|
|
||||||
# build the compiler and tools
|
# build the compiler and tools
|
||||||
RUN cd /tinygo/ && \
|
RUN cd /tinygo/ && \
|
||||||
git submodule update --init --recursive && \
|
git submodule update --init && \
|
||||||
make gen-device -j4 && \
|
make gen-device -j4 && \
|
||||||
make build/release
|
make build/release
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -191,7 +191,7 @@ gen-device: gen-device-stm32
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
gen-device-avr:
|
gen-device-avr:
|
||||||
@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
|
@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
|
||||||
$(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/
|
$(GO) build -o ./build/gen-device-avr ./tools/gen-device-avr/
|
||||||
./build/gen-device-avr lib/avr/packs/atmega src/device/avr/
|
./build/gen-device-avr lib/avr/packs/atmega src/device/avr/
|
||||||
./build/gen-device-avr lib/avr/packs/tiny src/device/avr/
|
./build/gen-device-avr lib/avr/packs/tiny src/device/avr/
|
||||||
@@ -265,7 +265,7 @@ endif
|
|||||||
.PHONY: wasi-libc
|
.PHONY: wasi-libc
|
||||||
wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
|
wasi-libc: lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a
|
||||||
lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
|
lib/wasi-libc/sysroot/lib/wasm32-wasi/libc.a:
|
||||||
@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
|
@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
|
||||||
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)
|
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)
|
||||||
|
|
||||||
# Check for Node.js used during WASM tests.
|
# Check for Node.js used during WASM tests.
|
||||||
|
|||||||
@@ -18,10 +18,10 @@
|
|||||||
#
|
#
|
||||||
# But you'll need a bit more to make TinyGo actually able to compile code:
|
# But you'll need a bit more to make TinyGo actually able to compile code:
|
||||||
#
|
#
|
||||||
# make llvm-source # fetch compiler-rt
|
# make llvm-source # fetch compiler-rt
|
||||||
# git submodule update --init --recursive # fetch lots of other libraries and SVD files
|
# git submodule update --init # fetch lots of other libraries and SVD files
|
||||||
# make gen-device -j4 # build src/device/*/*.go files
|
# make gen-device -j4 # build src/device/*/*.go files
|
||||||
# make wasi-libc # build support for wasi/wasm
|
# make wasi-libc # build support for wasi/wasm
|
||||||
#
|
#
|
||||||
# With this, you should have an environment that can compile anything - except
|
# With this, you should have an environment that can compile anything - except
|
||||||
# for the Xtensa architecture (ESP8266/ESP32) because support for that lives in
|
# for the Xtensa architecture (ESP8266/ESP32) because support for that lives in
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Docker hub does a recursive clone, then checks the branch out,
|
# Docker hub does a recursive clone, then checks the branch out,
|
||||||
# so when a PR adds a submodule (or updates it), it fails.
|
# so when a PR adds a submodule (or updates it), it fails.
|
||||||
git submodule update --init --recursive
|
git submodule update --init
|
||||||
|
|||||||
Reference in New Issue
Block a user