Skip to content

Simplify Compiler CI jobs #2430

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.

Sign up for GitHub

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Simplify Compiler CI jobs #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
665544c
Simplify Compiler CI jobs
justsmth May 21, 2025
3944ee1
More simplify
justsmth May 21, 2025
a816e14
Fix FIPS build w/ clang-20
justsmth May 21, 2025
b880227
Also skip FIPS for clang 20/21
justsmth May 21, 2025
1985a9d
Cleanup + comment
justsmth May 21, 2025
56451be
Merge branch 'main' into cimplify-compiler-ci
darylmartin100 May 22, 2025
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
279 changes: 89 additions & 190 deletions .github/workflows/actions-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,49 +164,6 @@ jobs:
echo ${env:SDEROOT}
.\tests\ci\run_windows_tests.bat "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 true

gcc-ubuntu-2004-sanity:
if: github.repository_owner == 'aws'
needs: [sanity-test-run]
strategy:
fail-fast: false
matrix:
gccversion:
- "10"
fips:
- "0"
- "1"
runs-on: ubuntu-22.04
container:
image: ubuntu:20.04
steps:
- run: |
env DEBIAN_FRONTEND=noninteractive apt-get update
env DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git curl cmake ninja-build \
gcc-${{ matrix.gccversion }} g++-${{ matrix.gccversion }}
- name: Install Newer Go Compiler
run: |
curl -L -o /tmp/go.tar.gz https://go.dev/dl/go1.24.2.linux-amd64.tar.gz
cat <<EOF >/tmp/go.tar.gz.sha256
68097bd680839cbc9d464a0edce4f7c333975e27a90246890e9f1078c7e702ad /tmp/go.tar.gz
EOF
sha256sum -c /tmp/go.tar.gz.sha256
(cd /usr/local && tar xvf /tmp/go.tar.gz)
- name: Checkout
run: |
git config --global --add safe.directory '*'
git clone --recursive ${{ github.server_url }}/${{ github.repository }}.git .
git fetch origin ${{ github.sha }}
git checkout --recurse-submodules -b ci-job ${{ github.sha }}
- name: Build Project
run: |
env PATH="/usr/local/go/bin:${PATH}" \
CC=gcc-${{ matrix.gccversion }} CXX=g++-${{ matrix.gccversion }} \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DFIPS=${{ matrix.fips }} -GNinja
cmake --build build --target all
- name: Run Tests
run: |
cmake --build build --target run_tests

clang-ubuntu-2004-sanity:
if: github.repository_owner == 'aws'
needs: [sanity-test-run]
Expand Down Expand Up @@ -250,113 +207,6 @@ jobs:
run: |
cmake --build build --target run_tests

gcc-ubuntu-2204-sanity:
if: github.repository_owner == 'aws'
needs: [sanity-test-run]
strategy:
fail-fast: false
matrix:
gccversion:
- "10"
- "11"
- "12"
fips:
- "0"
- "1"
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '>=1.18'
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: gcc-${{ matrix.gccversion }}
cxx-compiler: g++-${{ matrix.gccversion }}
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
- name: Build Project
run: cmake --build ./build --target all
- name: Run tests
run: cmake --build ./build --target run_tests

gcc-ubuntu-2404-sanity:
if: github.repository_owner == 'aws'
needs: [ sanity-test-run ]
strategy:
fail-fast: false
matrix:
gccversion:
- "12"
- "13"
- "14"
fips:
- "0"
- "1"
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: '>=1.18'
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: gcc-${{ matrix.gccversion }}
cxx-compiler: g++-${{ matrix.gccversion }}
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
- name: Build Project
# TODO: Re-enable gcc-14/FIPS build once delocator updated
if: ${{ !( matrix.gccversion == '14' && matrix.fips == '1' ) }}
run: cmake --build ./build --target all
- name: Run tests
# TODO: Re-enable gcc-14/FIPS build once delocator updated
if: ${{ !( matrix.gccversion == '14' && matrix.fips == '1' ) }}
run: cmake --build ./build --target run_tests

gcc-13-pedantic:
if: github.repository_owner == 'aws'
needs: [ sanity-test-run ]
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: gcc-13
cxx-compiler: g++-13
options: CMAKE_BUILD_TYPE=Release CMAKE_C_FLAGS=-pedantic CMAKE_CXX_FLAGS=-pedantic
- name: Build Crypto
run: cmake --build ./build --target crypto
- name: Build SSL
run: cmake --build ./build --target ssl

clang-19-pedantic:
if: github.repository_owner == 'aws'
needs: [ sanity-test-run ]
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- name: Install clang-19
run: |
wget https://apt.llvm.org/llvm.sh
chmod u+x llvm.sh
sudo ./llvm.sh 19
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: clang-19
cxx-compiler: clang++-19
options: CMAKE_BUILD_TYPE=Release CMAKE_C_FLAGS=-pedantic CMAKE_CXX_FLAGS=-pedantic
- name: Build Crypto
run: cmake --build ./build --target crypto
- name: Build SSL
run: cmake --build ./build --target ssl

clang-ubuntu-2204-sanity:
if: github.repository_owner == 'aws'
needs: [sanity-test-run]
Expand All @@ -367,8 +217,6 @@ jobs:
- "11"
- "12"
- "13"
- "14"
- "15"
fips:
- "0"
- "1"
Expand All @@ -395,64 +243,115 @@ jobs:
- name: Run tests
run: cmake --build ./build --target run_tests

clang-ubuntu-2404-sanity:
if: github.repository_owner == 'aws'
needs: [sanity-test-run]
compiler-tests:
env:
GOFLAGS: "-buildvcs=false"
strategy:
fail-fast: false
matrix:
clangversion:
- "16"
- "17"
- "18"
fips:
- "0"
- "1"
runs-on: ubuntu-24.04
fips: [0, 1]
compiler:
- 'gcc9'
- 'gcc10'
- 'gcc11'
- 'gcc12'
- 'gcc13'
- 'gcc14'
- 'gcc15'
- 'gcc16'
- 'clang14'
- 'clang15'
- 'clang16'
- 'clang17'
- 'clang18'
- 'clang19'
- 'clang20'
- 'clang21'
exclude:
- fips: 1
compiler: 'gcc14'
- fips: 1
compiler: 'gcc15'
- fips: 1
compiler: 'gcc16'
- fips: 1
compiler: 'clang20'
- fips: 1
compiler: 'clang21'
runs-on: ubuntu-latest
container:
image: ghcr.io/mattkretz/cplusplus-ci/${{ matrix.compiler }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '>=1.18'
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: clang-${{ matrix.clangversion }}
cxx-compiler: clang++-${{ matrix.clangversion }}
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
- name: Setup Clang
if: startsWith(matrix.compiler, 'clang')
run: |
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
- name: Setup GCC
if: startsWith(matrix.compiler, 'gcc')
run: |
echo "CC=gcc" >> $GITHUB_ENV
echo "CXX=g++" >> $GITHUB_ENV
- name: Setup Build
if: matrix.fips == 0
run:
cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release
- name: Setup FIPS Build
if: matrix.fips == 1
run:
cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release -DFIPS=1
- name: Build Project
run: cmake --build ./build --target all
- name: Run tests
run: cmake --build ./build --target run_tests

clang-19-sanity:
if: github.repository_owner == 'aws'
needs: [ sanity-test-run ]
pedantic-tests:
env:
GOFLAGS: "-buildvcs=false"
strategy:
fail-fast: false
matrix:
fips:
- "0"
- "1"
runs-on: ubuntu-22.04
fips: [0, 1]
compiler:
- 'gcc13'
- 'gcc15'
- 'clang19'
- 'clang20'
exclude:
- fips: 1
compiler: 'gcc15'
- fips: 1
compiler: 'clang20'
runs-on: ubuntu-latest
container:
image: ghcr.io/mattkretz/cplusplus-ci/${{ matrix.compiler }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '>=1.18'
- name: Install clang-19
- name: Setup Clang
if: startsWith(matrix.compiler, 'clang')
run: |
wget https://apt.llvm.org/llvm.sh
chmod u+x llvm.sh
sudo ./llvm.sh 19
- name: Setup CMake
uses: threeal/[email protected]
with:
generator: Ninja
c-compiler: clang-19
cxx-compiler: clang++-19
options: FIPS=${{ matrix.fips }} CMAKE_BUILD_TYPE=Release
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
- name: Setup GCC
if: startsWith(matrix.compiler, 'gcc')
run: |
echo "CC=gcc" >> $GITHUB_ENV
echo "CXX=g++" >> $GITHUB_ENV
- name: Setup Build
if: matrix.fips == 0
run:
cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release CMAKE_C_FLAGS=-pedantic CMAKE_CXX_FLAGS=-pedantic
- name: Setup FIPS Build
if: matrix.fips == 1
run:
cmake -G Ninja -B ./build -DCMAKE_BUILD_TYPE=Release -DFIPS=1 CMAKE_C_FLAGS=-pedantic CMAKE_CXX_FLAGS=-pedantic
- name: Build Project
run: cmake --build ./build --target all
- name: Run tests
Expand Down
5 changes: 5 additions & 0 deletions crypto/fipsmodule/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,11 @@ if(FIPS_DELOCATE)
set_target_properties(bcm_c_generated_asm PROPERTIES COMPILE_OPTIONS "-S")
set_target_properties(bcm_c_generated_asm PROPERTIES POSITION_INDEPENDENT_CODE ON)

# Clang 20+ warns when both "-S" and "-c" are used as options to the compiler.
if (CLANG AND (CMAKE_ASM_COMPILER_ID MATCHES "Clang" OR CMAKE_ASM_COMPILER MATCHES "clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER "19.99.99"))
set_target_properties(bcm_c_generated_asm PROPERTIES COMPILE_OPTIONS "-Wno-unused-command-line-argument")
endif()

set(TARGET "")
if(CMAKE_ASM_COMPILER_TARGET)
set(TARGET "--target=${CMAKE_ASM_COMPILER_TARGET}")
Expand Down
Loading