Always use rust toolchain 2022-07-25 (#124) · open-lambda/open-lambda@db7650b · GitHub
Skip to content

Commit db7650b

Browse files
author
Kai Mast
authored
Always use rust toolchain 2022-07-25 (#124)
This should fix build errors until we can move to a stable rust toolchain.
1 parent f3c682d commit db7650b

7 files changed

Lines changed: 151 additions & 141 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion

‎Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PWD=$(shell pwd)
22
WASM_TARGET=wasm32-unknown-unknown
3-
CARGO=cargo +nightly
43
GO=go
54
OL_DIR=$(abspath ./src)
65
OL_GO_FILES=$(shell find src/ -name '*.go')
@@ -34,7 +33,7 @@ endif
3433
all: ol imgs/lambda wasm-worker wasm-functions native-functions
3534

3635
wasm-worker:
37-
cd wasm-worker && ${CARGO} build ${BUILD_FLAGS} ${WASM_WORKER_FLAGS}
36+
cd wasm-worker && cargo build ${BUILD_FLAGS} ${WASM_WORKER_FLAGS}
3837
cp wasm-worker/target/${BUILDTYPE}/wasm-worker ./ol-wasm
3938

4039
wasm-functions:
@@ -48,10 +47,10 @@ native-functions: imgs/lambda
4847
ls test-registry/hashing.bin test-registry/noop.bin # guarantee they were created
4948

5049
update-dependencies:
51-
cd lambda/runtimes/native && ${CARGO} update
52-
cd wasm-worker && ${CARGO} update
53-
cd bin-functions && ${CARGO} update
54-
cd container-proxy && ${CARGO} update
50+
cd lambda/runtimes/native && cargo update
51+
cd wasm-worker && cargo update
52+
cd bin-functions && cargo update
53+
cd container-proxy && cargo update
5554

5655
imgs/lambda: $(LAMBDA_FILES)
5756
${MAKE} -C lambda
@@ -62,10 +61,10 @@ install-python-bindings:
6261
cd scripts && python setup.py install
6362

6463
check-runtime:
65-
cd lambda/runtimes/rust && ${CARGO} check
64+
cd lambda/runtimes/rust && cargo check
6665

6766
container-proxy:
68-
cd container-proxy && ${CARGO} build ${BUILD_FLAGS}
67+
cd container-proxy && cargo build ${BUILD_FLAGS}
6968
cp ./container-proxy/target/${BUILDTYPE}/open-lambda-container-proxy ./ol-container-proxy
7069

7170
ol: $(OL_GO_FILES)

‎bin-functions/rust-toolchain‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nightly-2022-07-25

‎container-proxy/Cargo.lock‎

Lines changed: 55 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎container-proxy/rust-toolchain‎

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)