Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin to nightly-2024-05-22 #432

Merged
merged 3 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
12 changes: 10 additions & 2 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/fips-bindings-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/sys-bindings-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
30 changes: 26 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion scripts/tools/cargo-dig.rs
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading