Skip to content

Commit a76db9f

Browse files
committed
Fix "std-compat" CI to actually test what it's supposed to
1 parent 743ab38 commit a76db9f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

.github/workflows/ci.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,17 @@ jobs:
131131
strategy:
132132
matrix:
133133
compiler: [gcc-8, clang-9]
134-
std: [c++11, c++14, c++17, c++2a]
134+
cxx-std: ["11", "14", "17", "20", "23"]
135135
steps:
136136
- uses: aws-actions/configure-aws-credentials@v4
137137
with:
138138
role-to-assume: ${{ env.CRT_CI_ROLE }}
139139
aws-region: ${{ env.AWS_DEFAULT_REGION }}
140140
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
141-
- name: Build ${{ env.PACKAGE_NAME }} with ${{ matrix.std }}
141+
- name: Build ${{ env.PACKAGE_NAME }} with cxx${{ matrix.cxx-std }}
142142
run: |
143-
export CXXFLAGS=-std=${{ matrix.std }}
144143
aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
145-
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --cmake-extra=-DUSE_OPENSSL=ON
144+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --compiler=${{ matrix.compiler }} --cmake-extra=-DUSE_OPENSSL=ON --cmake-extra=-DCMAKE_CXX_STANDARD=${{ matrix.cxx-std }}
146145
147146
byo-crypto:
148147
runs-on: ubuntu-24.04 # latest

0 commit comments

Comments
 (0)