Pin to nightly-2024-05-22 (#432)

* Pin to nightly-2024-05-22 * Setup LLVM on macos * Reduce macos env setup
aws · May 31, 2024 · ae79630 · ae79630
1 parent 0186ef7
commit ae79630
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 16 deletions.
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   # We can pin the version if nightly is too unstable.
   # Otherwise, we test against the latest version.
-  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
   # Mirai version tag, updates this whenever a new version
   # is released.
   MIRAI_TOOLCHAIN: nightly-2023-05-09
@@ -84,7 +84,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
-          toolchain: nightly
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
       - name: Install cargo-public-api
@@ -245,8 +245,10 @@ jobs:
         with:
           submodules: 'recursive'
           lfs: true
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@master
         id: toolchain
+        with:
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
       - name: Setup to use minimal versions

diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   # We can pin the version if nightly is too unstable.
   # Otherwise, we test against the latest version.
-  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
   aws-lc-rs-cross-test:
@@ -76,6 +76,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - run: |
+          brew install llvm
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
@@ -94,6 +98,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - run: |
+          brew install llvm
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
@@ -140,4 +148,4 @@ jobs:
           toolchain: stable
           target: aarch64-pc-windows-msvc
       - name: Build for `aarch64-pc-windows-msvc`
-        run: cargo build -p aws-lc-rs --target aarch64-pc-windows-msvc --features bindgen
+        run: cargo build -p aws-lc-rs --target aarch64-pc-windows-msvc --features bindgen
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -1,10 +1,16 @@
-name: Deploy Documentation
+ame: Deploy Documentation
 on:
   push:
     branches:
       - main
     tags:
       - v1.*
+env:
+  RUST_BACKTRACE: 1
+  # We can pin the version if nightly is too unstable.
+  # Otherwise, we test against the latest version.
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
+
 jobs:
   deploy-user-guide:
     if: github.repository == 'aws/aws-lc-rs'
@@ -15,8 +21,10 @@ jobs:
           persist-credentials: false
           submodules: 'recursive'
       - name: Install Nightly Rust Toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
         id: toolchain
+        with:
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
       - uses: actions/setup-go@v4

diff --git a/.github/workflows/fips-bindings-generator.yml b/.github/workflows/fips-bindings-generator.yml
@@ -10,6 +10,10 @@ env:
   GIT_AUTHOR_EMAIL: "aws-lc-github-bot@amazon.com"
   GIT_COMMITTER_NAME: "aws-lc-fips-sys-bindings-generator"
   GIT_COMMITTER_EMAIL: "aws-lc-github-bot@amazon.com"
+  RUST_BACKTRACE: 1
+  # We can pin the version if nightly is too unstable.
+  # Otherwise, we test against the latest version.
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
   collect-symbols-and-commit:
@@ -78,7 +82,9 @@ jobs:
         with:
           submodules: 'recursive'
           ref: ${{ github.ref_name }}
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
       - uses: dtolnay/rust-toolchain@stable
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   # We can pin the version if nightly is too unstable.
   # Otherwise, we test against the latest version.
-  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
   fips-test:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   # We can pin the version if nightly is too unstable.
   # Otherwise, we test against the latest version.
-  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
   s2n-quic-integration:
@@ -155,6 +155,18 @@ jobs:
           submodules: 'recursive'
           lfs: true
 
+      - if: ${{ matrix.os == 'macos-13-xlarge' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
+
+      - if: ${{ matrix.os == 'macos-12' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
+
       - name: Install NASM on Windows
         if: runner.os == 'Windows'
         uses: ilammy/setup-nasm@v1

diff --git a/.github/workflows/sys-bindings-generator.yml b/.github/workflows/sys-bindings-generator.yml
@@ -10,6 +10,10 @@ env:
   GIT_AUTHOR_EMAIL: "aws-lc-github-bot@amazon.com"
   GIT_COMMITTER_NAME: "aws-lc-sys-bindings-generator"
   GIT_COMMITTER_EMAIL: "aws-lc-github-bot@amazon.com"
+  RUST_BACKTRACE: 1
+  # We can pin the version if nightly is too unstable.
+  # Otherwise, we test against the latest version.
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
   collect-symbols-and-commit:
@@ -78,7 +82,9 @@ jobs:
         with:
           submodules: 'recursive'
           ref: ${{ github.ref_name }}
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
       - uses: dtolnay/rust-toolchain@stable
       - uses: actions/setup-go@v4
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ env:
   RUST_BACKTRACE: 1
   # We can pin the version if nightly is too unstable.
   # Otherwise, we test against the latest version.
-  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 
 jobs:
 
@@ -69,6 +69,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
+      - if: ${{ matrix.os == 'macos-13-xlarge' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
+      - if: ${{ matrix.os == 'macos-12' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
       - uses: dtolnay/rust-toolchain@master
         id: toolchain
         with:
@@ -372,8 +382,20 @@ jobs:
         with:
           submodules: 'recursive'
           lfs: true
-      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/rust-toolchain@master
         id: toolchain
+        with:
+          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
+      - if: ${{ matrix.os == 'macos-13-xlarge' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/opt/homebrew/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/opt/homebrew/opt/llvm' >> "$GITHUB_ENV"
+      - if: ${{ matrix.os == 'macos-12' }}
+        run: |
+          brew install llvm
+          echo 'export PATH="/usr/local/opt/llvm/bin:$PATH"'
+          echo 'export LIBCLANG_PATH=/usr/local/opt/llvm' >> "$GITHUB_ENV"
       - name: Set Rust toolchain override
         run: rustup override set ${{ steps.toolchain.outputs.name }}
       - name: Install cargo-careful
@@ -383,8 +405,8 @@ jobs:
           go-version: '>=1.18'
       - name: Run tests
         working-directory: ./aws-lc-rs
-        run: cargo +nightly careful test
+        run: cargo careful test
       - name: Run tests w/ FIPS
         working-directory: ./aws-lc-rs
         # Rust doc tests dislike dynamic linking
-        run: cargo +nightly careful test --tests --features fips,bindgen
+        run: cargo careful test --tests --features fips,bindgen
diff --git a/scripts/tools/cargo-dig.rs b/scripts/tools/cargo-dig.rs
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S cargo +nightly -Zscript
+#!/usr/bin/env -S cargo +nightly-2024-05-22 -Zscript
 ---cargo
 [dependencies]
 toml = "0.8"