Merge branch 'main' into build-env-static

.github/workflows/ci.yml

@@ -442,10 +442,6 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macOS-latest ]
         static: [ 0, 1 ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
       - uses: actions-rs/[email protected]
         id: toolchain
         with:
@@ -480,3 +476,22 @@ jobs:
         # Doc-tests fail to link with dynamic build
         # See: https://github.com/rust-lang/cargo/issues/8531
         run: AWS_LC_FIPS_SYS_STATIC=${{ matrix.static }} cargo test --tests --features fips
+
+  msrv:
+    name: Minimum Supported Rust Version
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+          lfs: true
+
+      - name: Install cargo-msrv
+        uses: actions-rs/[email protected]
+        with:
+          command: install
+          args: cargo-msrv
+
+      - name: Verify msrv
+        working-directory: ./aws-lc-rs
+        run: cargo msrv verify

Makefile

@@ -10,7 +10,7 @@ deinit-submodules:
 init: init-submodules
 	git config core.hooksPath .githooks
 	rustup component add rustfmt clippy
-	cargo install rust-script cargo-llvm-cov cargo-license public-api --locked
+	cargo install rust-script cargo-llvm-cov cargo-license public-api cargo-msrv --locked
 	cargo install cargo-audit --features=fix --locked
 
 update-aws-lc-fips-sys:

aws-lc-rs/Makefile

@@ -36,6 +36,9 @@ endif
 	cargo test --no-default-features --features aws-lc-sys,ring-io
 	cargo test --no-default-features --features aws-lc-sys,alloc
 
-ci: format clippy test coverage api-diff-pub
+msrv:
+	cargo msrv verify
 
-.PHONY: asan asan-fips asan-release ci clippy coverage test
+ci: format clippy msrv test coverage api-diff-pub
+
+.PHONY: asan asan-fips asan-release ci clippy coverage test msrv

scripts/tools/copyright_check.sh

@@ -11,8 +11,8 @@ AWS_LC_RS_FILES=$(find "$PWD" -type f \( -name "*.rs" -o -name "*.sh" \) -not \(
 FAILED=0
 
 for file in $AWS_LC_RS_FILES; do
-    # The word "Copyright" should appear at least once in the first 3 lines of every file
-    COUNT=`head -n 3 "${file}" | grep "Copyright" | wc -l`;
+    # The word "Copyright" should appear at least once in the first 4 lines of every file
+    COUNT=`head -n 4 "${file}" | grep "Copyright" | wc -l`;
     if [ "${COUNT}" -eq "0" ]; then
         FAILED=1;
         echo "Copyright Check Failed: $file";