Merge branch 'master' into reqcopy

Author: tylerharter

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
          profile: minimal
-         toolchain: nightly
+         toolchain: nightly-2022-07-25 #make sure this matches the version in the rust-toolchain files
          override: true
          components: cargo, rustc, clippy, rustfmt
          target: wasm32-unknown-unknown

.github/workflows/pkg.yml

@@ -31,7 +31,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
          profile: minimal
-         toolchain: nightly
+         toolchain: nightly-2022-07-25
          override: true
          components: cargo, rustc, clippy, rustfmt
          target: wasm32-unknown-unknown

Makefile

@@ -1,6 +1,5 @@
 PWD=$(shell pwd)
 WASM_TARGET=wasm32-unknown-unknown
-CARGO=cargo +nightly
 GO=go
 OL_DIR=$(abspath ./src)
 OL_GO_FILES=$(shell find src/ -name '*.go')
@@ -34,7 +33,7 @@ endif
 all: ol imgs/lambda wasm-worker wasm-functions native-functions
 
 wasm-worker:
-	cd wasm-worker && ${CARGO} build ${BUILD_FLAGS} ${WASM_WORKER_FLAGS}
+	cd wasm-worker && cargo build ${BUILD_FLAGS} ${WASM_WORKER_FLAGS}
 	cp wasm-worker/target/${BUILDTYPE}/wasm-worker ./ol-wasm
 
 wasm-functions:
@@ -48,10 +47,10 @@ native-functions: imgs/lambda
 	ls test-registry/hashing.bin test-registry/noop.bin # guarantee they were created
 
 update-dependencies:
-	cd lambda/runtimes/native && ${CARGO} update
-	cd wasm-worker && ${CARGO} update
-	cd bin-functions && ${CARGO} update
-	cd container-proxy && ${CARGO} update
+	cd lambda/runtimes/native && cargo update
+	cd wasm-worker && cargo update
+	cd bin-functions && cargo update
+	cd container-proxy && cargo update
 
 imgs/lambda: $(LAMBDA_FILES)
 	${MAKE} -C lambda
@@ -62,10 +61,10 @@ install-python-bindings:
 	cd scripts && python setup.py install
 
 check-runtime:
-	cd lambda/runtimes/rust && ${CARGO} check
+	cd lambda/runtimes/rust && cargo check
 
 container-proxy:
-	cd container-proxy && ${CARGO} build ${BUILD_FLAGS}
+	cd container-proxy && cargo build ${BUILD_FLAGS}
 	cp ./container-proxy/target/${BUILDTYPE}/open-lambda-container-proxy ./ol-container-proxy
 
 ol: $(OL_GO_FILES)

README.md

@@ -28,7 +28,7 @@ ln -s /usr/local/go/bin/go /usr/bin/go
 
 Further, you need to have a recent nightly version of Rust, the wasm32 toolchain, and the `cross` tool installed. The easiest way to do this is.
 ```
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly-2022-07-25
 source $HOME/.cargo/env
 rustup target add wasm32-unknown-unknown
 cargo install cross

bin-functions/rust-toolchain

@@ -0,0 +1 @@
+nightly-2022-07-25

container-proxy/Cargo.lock

@@ -0,0 +1 @@
+nightly-2022-07-25