Skip to content

Commit 6748c5d

Browse files
committed
Merge branch 'main' into connection-pool-destroy-issue
2 parents e351a69 + 6ab26a4 commit 6748c5d

File tree

2 files changed

+40
-5
lines changed

2 files changed

+40
-5
lines changed

.github/workflows/ci.yml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ jobs:
5656
- gcc-7
5757
- gcc-8
5858
steps:
59+
- name: Fix kernel mmap rnd bits
60+
# High entropy setting in GH runner images >= 20240310.1.0
61+
# causes ASAN blowing up here and there:
62+
# https://github.com/actions/runner-images/issues/9491
63+
run: sudo sysctl vm.mmap_rnd_bits=28
5964
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
6065
- name: Build ${{ env.PACKAGE_NAME }}
6166
run: |
@@ -68,6 +73,11 @@ jobs:
6873
matrix:
6974
sanitizers: [",thread", ",address,undefined"]
7075
steps:
76+
- name: Fix kernel mmap rnd bits
77+
# High entropy setting in GH runner images >= 20240310.1.0
78+
# causes ASAN blowing up here and there:
79+
# https://github.com/actions/runner-images/issues/9491
80+
run: sudo sysctl vm.mmap_rnd_bits=28
7181
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
7282
- name: Build ${{ env.PACKAGE_NAME }}
7383
run: |
@@ -77,6 +87,11 @@ jobs:
7787
linux-shared-libs:
7888
runs-on: ubuntu-22.04 # latest
7989
steps:
90+
- name: Fix kernel mmap rnd bits
91+
# High entropy setting in GH runner images >= 20240310.1.0
92+
# causes ASAN blowing up here and there:
93+
# https://github.com/actions/runner-images/issues/9491
94+
run: sudo sysctl vm.mmap_rnd_bits=28
8095
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
8196
- name: Build ${{ env.PACKAGE_NAME }}
8297
run: |
@@ -86,6 +101,11 @@ jobs:
86101
byo-crypto:
87102
runs-on: ubuntu-22.04 # latest
88103
steps:
104+
- name: Fix kernel mmap rnd bits
105+
# High entropy setting in GH runner images >= 20240310.1.0
106+
# causes ASAN blowing up here and there:
107+
# https://github.com/actions/runner-images/issues/9491
108+
run: sudo sysctl vm.mmap_rnd_bits=28
89109
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
90110
- name: Build ${{ env.PACKAGE_NAME }}
91111
run: |
@@ -146,6 +166,11 @@ jobs:
146166
downstream:
147167
runs-on: ubuntu-22.04 # latest
148168
steps:
169+
- name: Fix kernel mmap rnd bits
170+
# High entropy setting in GH runner images >= 20240310.1.0
171+
# causes ASAN blowing up here and there:
172+
# https://github.com/actions/runner-images/issues/9491
173+
run: sudo sysctl vm.mmap_rnd_bits=28
149174
# We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
150175
- name: Build ${{ env.PACKAGE_NAME }}
151176
run: |
@@ -155,7 +180,12 @@ jobs:
155180
linux-debug:
156181
runs-on: ubuntu-22.04 # latest
157182
steps:
158-
- name: Build ${{ env.PACKAGE_NAME }}
159-
run: |
160-
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
161-
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DASSERT_LOCK_HELD=ON --config Debug
183+
- name: Fix kernel mmap rnd bits
184+
# High entropy setting in GH runner images >= 20240310.1.0
185+
# causes ASAN blowing up here and there:
186+
# https://github.com/actions/runner-images/issues/9491
187+
run: sudo sysctl vm.mmap_rnd_bits=28
188+
- name: Build ${{ env.PACKAGE_NAME }}
189+
run: |
190+
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
191+
./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DASSERT_LOCK_HELD=ON --config Debug

.github/workflows/codecov.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ jobs:
2020
runs-on: ubuntu-22.04
2121
steps:
2222
- name: Checkout Sources
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
24+
- name: Fix kernel mmap rnd bits
25+
# High entropy setting in GH runner images >= 20240310.1.0
26+
# causes ASAN blowing up here and there:
27+
# https://github.com/actions/runner-images/issues/9491
28+
run: sudo sysctl vm.mmap_rnd_bits=28
2429
- name: Build ${{ env.PACKAGE_NAME }} + consumers
2530
run: |
2631
python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"

0 commit comments

Comments
 (0)