diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index e4590f2c9deb..06d8d0bc18bb 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -146,7 +146,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-14, macos-latest, windows-latest ] steps: - uses: actions/checkout@v3 with: @@ -177,7 +177,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-14, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-14, macos-latest, windows-latest ] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index ed78f5209c09..ea64a1c240d1 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -278,7 +278,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-14, macos-latest, windows-latest, windows-11-arm ] + os: [ ubuntu-latest, ubuntu-24.04-arm, macos-14, macos-latest, windows-latest, windows-11-arm ] c_std: [ "11", "99" ] cmake: [ '0', '1' ] exclude: diff --git a/.github/workflows/fips-bindings-generator.yml b/.github/workflows/fips-bindings-generator.yml index a14fd76fa89b..c357d8bcf5cf 100644 --- a/.github/workflows/fips-bindings-generator.yml +++ b/.github/workflows/fips-bindings-generator.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-latest, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4 with: @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/fips.yml b/.github/workflows/fips.yml index aebe8a777a01..8ea7f422293a 100644 --- a/.github/workflows/fips.yml +++ b/.github/workflows/fips.yml @@ -31,7 +31,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] args: - --release --all-targets --features fips,unstable - --profile release-lto --all-targets --features fips,unstable @@ -60,7 +60,7 @@ jobs: brew uninstall --force cmake brew install --force cmake cmake --version - echo 'CMAKE=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/bin/cmake' >> $GITHUB_ENV + echo 'CMAKE=/opt/homebrew/bin/cmake' >> $GITHUB_ENV - name: Run cargo test working-directory: ./aws-lc-rs run: cargo test ${{ matrix.args }} diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index cf31d7c5838d..0ed8f4a3bec4 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] env: GIT_CLONE_PROTECTION_ACTIVE: false steps: @@ -50,7 +50,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] latest: [ 0, 1 ] steps: - uses: actions/checkout@v3 @@ -123,7 +123,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] features: [ aws-lc-rs, aws-lc-rs-fips, aws-lc-sys, aws-lc-fips-sys ] steps: - uses: actions/checkout@v3 @@ -198,7 +198,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ windows-latest, ubuntu-latest, macos-13, macos-latest ] + os: [ windows-latest, ubuntu-latest, macos-latest ] crate: [ aws-lc-sys, aws-lc-fips-sys ] args: - publish --dry-run @@ -242,7 +242,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ windows-latest, ubuntu-latest, macos-13, macos-latest ] + os: [ windows-latest, ubuntu-latest, macos-latest ] args: - publish --dry-run steps: @@ -320,7 +320,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - uses: actions/checkout@v3 with: @@ -330,8 +330,8 @@ jobs: - if: ${{ startsWith(matrix.os, 'macos-') }} run: | brew install llvm - echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV - echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV + echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV + echo 'LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config' >> $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 index be05f556686d..b11997b15715 100644 --- a/.github/workflows/sys-bindings-generator.yml +++ b/.github/workflows/sys-bindings-generator.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ ubuntu-latest, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4 with: @@ -165,7 +165,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4 with: @@ -258,7 +258,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-14 ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8139b7ac5351..1afa89e3562d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ ubuntu-latest, macos-13, macos-latest, ubuntu-24.04-arm ] + os: [ ubuntu-latest, macos-latest, ubuntu-24.04-arm ] args: - --all-targets --features unstable - --release --all-targets --features unstable @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: rust: [ stable ] - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] args: - --no-default-features --features aws-lc-sys,bindgen,unstable - --release --all-targets --features bindgen,unstable @@ -73,8 +73,8 @@ jobs: - if: ${{ startsWith(matrix.os, 'macos-') }} run: | brew install llvm - echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV - echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV + echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV + echo 'LLVM_CONFIG_PATH=/usr/local/opt/llvm/bin/llvm-config' >> $GITHUB_ENV - uses: dtolnay/rust-toolchain@master id: toolchain with: @@ -190,7 +190,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] static: [ 0, 1 ] steps: - uses: actions/checkout@v4 @@ -280,7 +280,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v4 with: @@ -337,14 +337,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] static: [ 0, 1 ] exclude: # The FIPS build on macOS can only produce shared libraries. - os: 'macos-latest' static: 1 - - os: 'macos-13' - static: 1 steps: - uses: actions/checkout@v4 with: @@ -365,7 +363,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - uses: actions/checkout@v4 with: @@ -400,7 +398,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - uses: actions/checkout@v4 with: @@ -439,7 +437,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - uses: actions/checkout@v4 with: @@ -470,7 +468,6 @@ jobs: matrix: os: - ubuntu-latest - - macos-13 - macos-latest steps: - uses: actions/checkout@v4 @@ -487,8 +484,8 @@ jobs: - if: ${{ startsWith(matrix.os, 'macos-') }} run: | brew install llvm - echo 'LIBCLANG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/lib' >> $GITHUB_ENV - echo 'LLVM_CONFIG_PATH=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/opt/llvm/bin/llvm-config' >> $GITHUB_ENV + echo 'LIBCLANG_PATH=/opt/homebrew/opt/llvm/lib' >> $GITHUB_ENV + echo 'LLVM_CONFIG_PATH=/opt/homebrew/opt/llvm/bin/llvm-config' >> $GITHUB_ENV - name: Set Rust toolchain override run: rustup override set ${{ steps.toolchain.outputs.name }} - uses: actions/setup-go@v4 @@ -539,7 +536,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + os: [ ubuntu-latest, macos-latest, windows-latest ] fips: [ 0, 1 ] exclude: # macOS aarch64 fix for FIPS pending the following PR applied to FIPS branch: @@ -573,7 +570,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-13, macos-latest ] + os: [ ubuntu-latest, macos-latest ] pregen_src: [ 0, 1 ] steps: - uses: actions/checkout@v4 @@ -599,7 +596,7 @@ jobs: brew uninstall --force cmake brew install --force cmake cmake --version - echo 'CMAKE=${{ (matrix.os == 'macos-13' && '/usr/local') || '/opt/homebrew' }}/bin/cmake' >> $GITHUB_ENV + echo 'CMAKE=/opt/homebrew/bin/cmake' >> $GITHUB_ENV - name: Run cargo test working-directory: "path has spaces/aws-lc-rs" run: cargo test --tests -p aws-lc-rs --features bindgen