Merge branch 'main' into ml-dsa-unique-names

aws · Dec 24, 2024 · ae01f07 · ae01f07
2 parents 2bbdfc9 + 2329adb
commit ae01f07
Show file tree

Hide file tree

Showing 10 changed files with 2,127 additions and 932 deletions.
diff --git a/.github/workflows/aws-lc-rs.yml b/.github/workflows/aws-lc-rs.yml
@@ -10,67 +10,120 @@ concurrency:
 env:
   GOPROXY: https://proxy.golang.org,direct
   AWS_LC_SYS_CMAKE_BUILDER: 1
-  RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
+  RUST_NIGHTLY_TOOLCHAIN: nightly
+  RUST_SCRIPT_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
 jobs:
-  standard:
+  aws-lc-rs-bindgen:
     if: github.repository_owner == 'aws'
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    name: aws-lc-rs bindgen on ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-14-xlarge ]
     steps:
       - uses: actions/checkout@v3
         with:
-          repository: awslabs/aws-lc-rs
+          repository: aws/aws-lc-rs
           path: ./aws-lc-rs
           submodules: false
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          # Our aws-lc-sys generation scripts require nightly.
-          toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN }}
-      - run: rustup override set $RUST_NIGHTLY_TOOLCHAIN
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: rust-script
-      - name: Install OS Dependencies
-        run: |
-          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
-          sudo apt-get -y --no-install-recommends install cmake gcc clang ninja-build golang
       - name: Remove aws-lc submodule from crate directory
         working-directory: ./aws-lc-rs/aws-lc-sys
         run: |
           rm -rf aws-lc
       - uses: actions/checkout@v3
         with:
           path: ./aws-lc-rs/aws-lc-sys/aws-lc
-      - name: Regenerate aws-lc-sys crate
-        working-directory: ./aws-lc-rs/aws-lc-sys
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_SCRIPT_NIGHTLY_TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.20'
+      - name: Install current Bash on macOS
+        if: runner.os == 'macOS'
+        run: brew install bash coreutils
+      - name: No-prefix build for ${{ matrix.os }}
+        env:
+          AWS_LC_SYS_NO_PREFIX: "1"
+          # Ensure that we collect symbols unique to C99 builds
+          AWS_LC_SYS_C_STD: "99"
+        working-directory: ./aws-lc-rs
         run: |
-          rm -rf symbols/*
-          rm -rf generated-include/openssl/*
-          ../scripts/generate/_collect_symbols_build.sh -c aws-lc-sys
-          ../scripts/generate/_generate_prefix_headers.sh -c aws-lc-sys
-          ../scripts/generate/_generate_bindings.sh -c aws-lc-sys
-      - name: aws-lc-sys build
-        working-directory: ./aws-lc-rs/aws-lc-sys
+          cargo test -p aws-lc-sys --features bindgen
+      - name: Collect symbols
+        working-directory: ./aws-lc-rs
         run: |
-          cargo build
-      - name: aws-lc-sys test
-        working-directory: ./aws-lc-rs/aws-lc-sys
+          ./scripts/build/collect_symbols.sh -c aws-lc-sys
+      - name: Generate Prefix Headers
+        working-directory: ./aws-lc-rs
+        run: ./scripts/generate/_generate_prefix_headers.sh -c aws-lc-sys
+      - name: Update sys-crate metadata
+        working-directory: ./aws-lc-rs
+        run: ./scripts/ci/update_sys_crate_metadata.sh aws-lc-sys
+      - name: Generate bindings for ${{ matrix.os }}
+        env:
+          AWS_LC_SYS_PREGENERATING_BINDINGS: "1"
+        working-directory: ./aws-lc-rs
         run: |
-          cargo test
-      - name: aws-lc-sys packaging
+          cargo test -p aws-lc-sys --features bindgen
+      - name: Collect source from ${{ matrix.os }}
+        working-directory: ./aws-lc-rs
+        run: ./scripts/build/collect_build_src.sh
+  windows-aws-lc-rs-bindgen:
+    if: github.repository_owner == 'aws'
+    runs-on: ${{ matrix.os }}
+    name: aws-lc-rs bindgen on ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest ]
+        target: [ x86_64-pc-windows-msvc ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: aws/aws-lc-rs
+          path: ./aws-lc-rs
+          submodules: false
+      - name: Remove aws-lc submodule from crate directory
         working-directory: ./aws-lc-rs/aws-lc-sys
+        shell: bash
         run: |
-          cargo package --allow-dirty
-      - name: aws-lc-rs build
-        working-directory: ./aws-lc-rs/aws-lc-rs
+          rm -rf aws-lc
+      - uses: actions/checkout@v3
+        with:
+          path: ./aws-lc-rs/aws-lc-sys/aws-lc
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ env.RUST_SCRIPT_NIGHTLY_TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.20'
+      - uses: ilammy/setup-nasm@v1
+      - name: No-prefix build for ${{ matrix.target }}
+        env:
+          AWS_LC_SYS_NO_PREFIX: "1"
+        working-directory: ./aws-lc-rs
         run: |
-          cargo build
-      - name: aws-lc-rs test
-        working-directory: ./aws-lc-rs/aws-lc-rs
+          cargo test -p aws-lc-sys --features bindgen --target  ${{ matrix.target }}
+      - name: Collect symbols
+        working-directory: ./aws-lc-rs
+        shell: bash
         run: |
-          cargo test
-      - name: Install cross
-        run: cargo install cross --git https://github.com/cross-rs/cross
-      - name: Cross-compile arm-linux-androideabi
+          ./scripts/build/collect_symbols.sh -c aws-lc-sys -t ${{ matrix.target }}
+      - name: Generate Prefix Headers
+        working-directory: ./aws-lc-rs
+        shell: bash
+        run: ./scripts/generate/_generate_prefix_headers.sh -c aws-lc-sys
+      - name: Update sys-crate metadata
         working-directory: ./aws-lc-rs
-        run: cross test -p aws-lc-rs --release --features bindgen,unstable --target arm-linux-androideabi
+        shell: bash
+        run: ./scripts/ci/update_sys_crate_metadata.sh aws-lc-sys
+      - name: Generate bindings for ${{ matrix.target }}
+        env:
+          AWS_LC_SYS_PREGENERATING_BINDINGS: "1"
+        working-directory: ./aws-lc-rs
+        run: |
+          cargo test -p aws-lc-sys --features bindgen --target ${{ matrix.target }}
diff --git a/.github/workflows/integrations.yml b/.github/workflows/integrations.yml
@@ -10,25 +10,13 @@ concurrency:
 env:
   CC: gcc
 jobs:
-  haproxy:
-    if: github.repository_owner == 'aws'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install OS Dependencies
-        run: |
-          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
-          sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make
-      - uses: actions/checkout@v3
-      - name: Run integration build
-        run: |
-          ./tests/ci/integration/run_haproxy_integration.sh
   tpm2-tss:
     if: github.repository_owner == 'aws'
     runs-on: ubuntu-latest
     steps:
       - name: Install OS Dependencies
         run: |
-          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none && sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang autoconf-archive libcmocka0 libcmocka-dev procps iproute2 build-essential git pkg-config gcc libtool automake libssl-dev uthash-dev autoconf doxygen libjson-c-dev libini-config-dev libcurl4-openssl-dev uuid-dev libltdl-dev libusb-1.0-0-dev libftdi-dev libglib2.0-dev pandoc
+          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none && sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang autoconf-archive libcmocka0 libcmocka-dev procps iproute2 build-essential git pkg-config gcc libtool automake libssl-dev uthash-dev autoconf doxygen libjson-c-dev libini-config-dev libcurl4-openssl-dev uuid-dev libltdl-dev libusb-1.0-0-dev libftdi-dev libglib2.0-dev pandoc libpsl-dev
       - uses: actions/checkout@v3
       - name: Run integration build
         run: |
@@ -63,30 +51,6 @@ jobs:
       - name: Run integration build
         run: |
           ./tests/ci/integration/run_tcpdump_integration.sh
-  trousers:
-    if: github.repository_owner == 'aws'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install OS Dependencies
-        run: |
-          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
-          sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make
-      - uses: actions/checkout@v3
-      - name: Run trousers build
-        run: |
-          ./tests/ci/integration/run_trousers_integration.sh
-  ntp:
-    if: github.repository_owner == 'aws'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install OS Dependencies
-        run: |
-          sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
-          sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make
-      - uses: actions/checkout@v3
-      - name: Run ntp build
-        run: |
-          ./tests/ci/integration/run_ntp_integration.sh
   socat:
     if: github.repository_owner == 'aws'
     runs-on: ubuntu-latest

diff --git a/.github/workflows/misc-tests.yaml b/.github/workflows/misc-tests.yaml
@@ -32,12 +32,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Install jq
+    - if: ${{ github.event.pull_request != null }}
+      name: Install jq
       run: |
         sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
         sudo apt-get install -y jq
 
-    - name: Check PR description
+    - if: ${{ github.event.pull_request != null }}
+      name: Check PR description
       run: |
         # License statement we want present.
         LICENSE_STATEMENT="By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license."