Skip to content

Commit e1dd55f

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ci-pipeline
2 parents cf7cdeb + 541547d commit e1dd55f

File tree

910 files changed

+221387
-37544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

910 files changed

+221387
-37544
lines changed

.clang-tidy

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
Checks: '
3+
-*,
4+
bugprone-*,
5+
cert-*,
6+
clang-analyzer,
7+
concurrency-*,
8+
cppcoreguidelines-*,
9+
hicpp-*,
10+
misc-*,
11+
modernize-*,
12+
performance-*,
13+
portability-*,
14+
'
15+
WarningsAsErrors: ''

.github/workflows/actions-ci.yml

Lines changed: 94 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
os:
40-
- "macos-14-large"
41-
- "macos-13-large"
40+
- "macos-13"
4241
steps:
4342
- uses: actions/checkout@v3
4443
- uses: actions/setup-go@v4
@@ -56,8 +55,7 @@ jobs:
5655
fail-fast: false
5756
matrix:
5857
os:
59-
- "macos-14-large"
60-
- "macos-13-large"
58+
- "macos-13"
6159
steps:
6260
- uses: actions/checkout@v3
6361
- uses: actions/setup-go@v4
@@ -75,8 +73,8 @@ jobs:
7573
fail-fast: false
7674
matrix:
7775
os:
78-
- "macos-14-xlarge"
79-
- "macos-13-xlarge"
76+
- "macos-14"
77+
- "macos-15"
8078
steps:
8179
- uses: actions/checkout@v3
8280
- uses: actions/setup-go@v4
@@ -94,8 +92,8 @@ jobs:
9492
fail-fast: false
9593
matrix:
9694
os:
97-
- "macos-14-xlarge"
98-
- "macos-13-xlarge"
95+
- "macos-14"
96+
- "macos-15"
9997
steps:
10098
- uses: actions/checkout@v3
10199
- uses: actions/setup-go@v4
@@ -115,8 +113,8 @@ jobs:
115113
uses: actions/checkout@v3
116114
- name: Build Windows Dependencies
117115
run: |
118-
choco install ninja --version 1.9.0.20190208 -y &&
119-
choco install nasm --version 2.14.02 -y
116+
choco install ninja -y &&
117+
choco install nasm -y
120118
- name: Run Windows Tests on MSVC-2019
121119
run: |
122120
.\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
@@ -130,8 +128,8 @@ jobs:
130128
uses: actions/checkout@v3
131129
- name: Build Windows Dependencies
132130
run: |
133-
choco install ninja --version 1.9.0.20190208 -y &&
134-
choco install nasm --version 2.14.02 -y
131+
choco install ninja -y &&
132+
choco install nasm -y
135133
- name: Run Windows Tests on MSVC-2022
136134
run: |
137135
.\tests\ci\run_windows_tests.bat "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
@@ -148,8 +146,8 @@ jobs:
148146

149147
- name: Build Windows Dependencies
150148
run: |
151-
choco install ninja --version 1.9.0.20190208 -y &&
152-
choco install nasm --version 2.14.02 -y
149+
choco install ninja -y &&
150+
choco install nasm -y
153151
154152
- name: Install SDE simulator
155153
run: |
@@ -177,23 +175,80 @@ jobs:
177175
fips:
178176
- "0"
179177
- "1"
180-
runs-on: ubuntu-20.04
178+
runs-on: ubuntu-22.04
179+
container:
180+
image: ubuntu:20.04
181181
steps:
182-
- uses: actions/checkout@v3
183-
- uses: actions/setup-go@v4
184-
with:
185-
go-version: '>=1.18'
186-
- name: Setup CMake
187-
uses: threeal/[email protected]
188-
with:
189-
generator: Ninja
190-
c-compiler: gcc-${{ matrix.gccversion }}
191-
cxx-compiler: g++-${{ matrix.gccversion }}
192-
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
182+
- run: |
183+
env DEBIAN_FRONTEND=noninteractive apt-get update
184+
env DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git curl cmake ninja-build \
185+
gcc-${{ matrix.gccversion }} g++-${{ matrix.gccversion }}
186+
- name: Install Newer Go Compiler
187+
run: |
188+
curl -L -o /tmp/go.tar.gz https://go.dev/dl/go1.24.2.linux-amd64.tar.gz
189+
cat <<EOF >/tmp/go.tar.gz.sha256
190+
68097bd680839cbc9d464a0edce4f7c333975e27a90246890e9f1078c7e702ad /tmp/go.tar.gz
191+
EOF
192+
sha256sum -c /tmp/go.tar.gz.sha256
193+
(cd /usr/local && tar xvf /tmp/go.tar.gz)
194+
- name: Checkout
195+
run: |
196+
git config --global --add safe.directory '*'
197+
git clone --recursive ${{ github.server_url }}/${{ github.repository }}.git .
198+
git fetch origin ${{ github.sha }}
199+
git checkout --recurse-submodules -b ci-job ${{ github.sha }}
193200
- name: Build Project
194-
run: cmake --build ./build --target all
195-
- name: Run tests
196-
run: cmake --build ./build --target run_tests
201+
run: |
202+
env PATH="/usr/local/go/bin:${PATH}" \
203+
CC=gcc-${{ matrix.gccversion }} CXX=g++-${{ matrix.gccversion }} \
204+
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DFIPS=${{ matrix.fips }} -GNinja
205+
cmake --build build --target all
206+
- name: Run Tests
207+
run: |
208+
cmake --build build --target run_tests
209+
210+
clang-ubuntu-2004-sanity:
211+
if: github.repository_owner == 'aws'
212+
needs: [sanity-test-run]
213+
strategy:
214+
fail-fast: false
215+
matrix:
216+
clangversion:
217+
- "10"
218+
fips:
219+
- "0"
220+
- "1"
221+
runs-on: ubuntu-22.04
222+
container:
223+
image: ubuntu:20.04
224+
steps:
225+
- run: |
226+
env DEBIAN_FRONTEND=noninteractive apt-get update
227+
env DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git curl cmake ninja-build \
228+
clang-${{ matrix.clangversion }} clang++-${{ matrix.clangversion }}
229+
- name: Install Newer Go Compiler
230+
run: |
231+
curl -L -o /tmp/go.tar.gz https://go.dev/dl/go1.24.2.linux-amd64.tar.gz
232+
cat <<EOF >/tmp/go.tar.gz.sha256
233+
68097bd680839cbc9d464a0edce4f7c333975e27a90246890e9f1078c7e702ad /tmp/go.tar.gz
234+
EOF
235+
sha256sum -c /tmp/go.tar.gz.sha256
236+
(cd /usr/local && tar xvf /tmp/go.tar.gz)
237+
- name: Checkout
238+
run: |
239+
git config --global --add safe.directory '*'
240+
git clone --recursive ${{ github.server_url }}/${{ github.repository }}.git .
241+
git fetch origin ${{ github.sha }}
242+
git checkout --recurse-submodules -b ci-job ${{ github.sha }}
243+
- name: Build Project
244+
run: |
245+
env PATH="/usr/local/go/bin:${PATH}" \
246+
CC=clang-${{ matrix.clangversion }} CXX=clang++-${{ matrix.clangversion }} \
247+
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DFIPS=${{ matrix.fips }} -GNinja
248+
cmake --build build --target all
249+
- name: Run Tests
250+
run: |
251+
cmake --build build --target run_tests
197252
198253
gcc-ubuntu-2204-sanity:
199254
if: github.repository_owner == 'aws'
@@ -302,44 +357,15 @@ jobs:
302357
- name: Build SSL
303358
run: cmake --build ./build --target ssl
304359

305-
clang-ubuntu-2004-sanity:
360+
clang-ubuntu-2204-sanity:
306361
if: github.repository_owner == 'aws'
307362
needs: [sanity-test-run]
308363
strategy:
309364
fail-fast: false
310365
matrix:
311366
clangversion:
312-
- "10"
313367
- "11"
314368
- "12"
315-
fips:
316-
- "0"
317-
- "1"
318-
runs-on: ubuntu-20.04
319-
steps:
320-
- uses: actions/checkout@v3
321-
- uses: actions/setup-go@v4
322-
with:
323-
go-version: '>=1.18'
324-
- name: Setup CMake
325-
uses: threeal/[email protected]
326-
with:
327-
generator: Ninja
328-
c-compiler: clang-${{ matrix.clangversion }}
329-
cxx-compiler: clang++-${{ matrix.clangversion }}
330-
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
331-
- name: Build Project
332-
run: cmake --build ./build --target all
333-
- name: Run tests
334-
run: cmake --build ./build --target run_tests
335-
336-
clang-ubuntu-2204-sanity:
337-
if: github.repository_owner == 'aws'
338-
needs: [sanity-test-run]
339-
strategy:
340-
fail-fast: false
341-
matrix:
342-
clangversion:
343369
- "13"
344370
- "14"
345371
- "15"
@@ -352,6 +378,11 @@ jobs:
352378
- uses: actions/setup-go@v4
353379
with:
354380
go-version: '>=1.18'
381+
- name: Install Clang ${{ matrix.clangversion }}
382+
if: ${{ matrix.clangversion == '11' || matrix.clangversion == '12' }}
383+
run: |
384+
env DEBIAN_FRONTEND=noninteractive sudo apt-get update
385+
env DEBIAN_FRONTEND=noninteractive sudo apt-get install -y clang-${{ matrix.clangversion }}
355386
- name: Setup CMake
356387
uses: threeal/[email protected]
357388
with:
@@ -439,7 +470,7 @@ jobs:
439470
steps:
440471
- uses: actions/checkout@v3
441472
- name: OpenBSD
442-
uses: cross-platform-actions/action@595d543e5d1aeb6d48c0a176965028afe56c7018
473+
uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d
443474
env:
444475
AWS_LC_SSL_TEST_RUNNER_PEEK_ROUNDS: 5
445476
AWS_LC_GO_TEST_TIMEOUT: 120m
@@ -566,14 +597,14 @@ jobs:
566597
- 'x86-64'
567598
- 'arm64'
568599
version:
569-
- '13.3'
570-
- '14.1'
600+
- '13.5'
601+
- '14.2'
571602
steps:
572603
- uses: actions/checkout@v4
573604
with:
574605
submodules: 'recursive'
575606
- name: Prepare VM
576-
uses: cross-platform-actions/action@v0.25.0
607+
uses: cross-platform-actions/action@2d97d42e1972a17b045fd709a422f7e55a86230d
577608
env:
578609
AWS_LC_SSL_TEST_RUNNER_PEEK_ROUNDS: 5
579610
AWS_LC_GO_TEST_TIMEOUT: 90m

.github/workflows/aws-lc-rs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [ ubuntu-latest, macos-14-xlarge, windows-latest ]
23+
os: [ ubuntu-latest, macos-latest, windows-latest ]
2424
steps:
2525
- uses: actions/checkout@v3
2626
with:
@@ -87,4 +87,4 @@ jobs:
8787
- name: Collect source from ${{ matrix.os }}
8888
if: runner.os != 'Windows'
8989
working-directory: ./aws-lc-rs
90-
run: ./scripts/build/collect_build_src.sh
90+
run: ./scripts/build/collect_build_src.sh

.github/workflows/clang-tidy-post.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: clang-tidy-post
2+
3+
on:
4+
workflow_run:
5+
workflows: ["clang-tidy-review"]
6+
types:
7+
- completed
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: ZedThree/clang-tidy-review/[email protected]
14+
with:
15+
lgtm_comment_body: '' # An empty string means it won't post a LGTM message
16+
annotations: false
17+
max_comments: 10
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: clang-tidy-review
2+
on: [pull_request]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v4
9+
- uses: actions/setup-go@v4
10+
with:
11+
go-version: '>=1.18'
12+
- uses: ZedThree/[email protected]
13+
with:
14+
split_workflow: true
15+
clang_tidy_version: 19
16+
install_commands: /github/workspace/util/build_compilation_database.sh
17+
- uses: ZedThree/clang-tidy-review/[email protected]

.github/workflows/cmake.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
cmake:
2121
- { version: "3.5", url: "https://cmake.org/files/v3.5/cmake-3.5.0.tar.gz", hash: "92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa" }
2222
- { version: "3.28", url: "https://cmake.org/files/v3.28/cmake-3.28.1.tar.gz", hash: "15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad" }
23+
- { version: "4.0", url: "https://cmake.org/files/v4.0/cmake-4.0.0.tar.gz", hash: "ddc54ad63b87e153cf50be450a6580f1b17b4881de8941da963ff56991a4083b" }
2324
generator:
2425
- "Unix Makefiles"
2526
- "Ninja"

.github/workflows/integrations.yml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,42 @@ jobs:
4848
- name: Run librdkafka build
4949
run: |
5050
./tests/ci/integration/run_librdkafka_integration.sh
51-
51+
socat:
52+
if: github.repository_owner == 'aws'
53+
runs-on: ubuntu-latest
54+
env:
55+
SHELL: /usr/bin/bash
56+
steps:
57+
- name: Install OS Dependencies
58+
run: |
59+
sudo apt-get update -o Acquire::Languages=none -o Acquire::Translation=none
60+
sudo apt-get -y --no-install-recommends install cmake gcc ninja-build golang make autoconf pkg-config openssl
61+
- uses: actions/checkout@v4
62+
- name: Run socat integration test
63+
run: |
64+
./tests/ci/integration/run_socat_integration.sh
65+
rust-openssl:
66+
if: github.repository_owner == 'aws'
67+
runs-on: ubuntu-latest
68+
steps:
69+
- name: Checkout aws-lc
70+
uses: actions/checkout@v4
71+
with:
72+
path: aws-lc
73+
- name: Checkout rust-openssl
74+
uses: actions/checkout@v4
75+
with:
76+
repository: sfackler/rust-openssl
77+
path: rust-openssl
78+
- uses: dtolnay/rust-toolchain@stable
79+
id: toolchain
80+
- name: Set Rust toolchain override
81+
run: rustup override set ${{ steps.toolchain.outputs.name }}
82+
- name: Install bindgen-cli
83+
run: cargo install --locked bindgen-cli
84+
- name: Run rust-openssl integration tests
85+
env:
86+
RUST_OPENSSL_SRC_DIR: "${{ github.workspace }}/rust-openssl"
87+
run: |
88+
pushd "${GITHUB_WORKSPACE}/aws-lc"
89+
./tests/ci/integration/run_rust_openssl_integration.sh

0 commit comments

Comments
 (0)