From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 21 Mar 2024 06:56:15 +0000 (+0000)
Subject: CI: revert the mmap_rnd_bits kludge
X-Git-Tag: v256-rc1~457
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0e1cb989bcc43bd3e7e5729cbea7d33571fe65;p=thirdparty%2Fsystemd.git

CI: revert the mmap_rnd_bits kludge

This reverts commit 2e0c2fb8fb15faeedf213930a4c2a3a6d584101f and commit
b7c7498de814b1e9825b43c28e307a7f0af8ffd2 now that
https://github.com/actions/runner-images/issues/9491 is closed.
---

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 9ef23329800..b6476d70452 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -34,8 +34,5 @@ jobs:
     steps:
       - name: Repository checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-      # FIXME: drop once https://github.com/actions/runner-images/issues/9491  is resolved
-      - name: Reduce ASLR entropy
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Build check
         run: .github/workflows/build_test.sh
diff --git a/.github/workflows/cflite_pr.yml b/.github/workflows/cflite_pr.yml
index bf7a14e356a..707ea0b6ba6 100644
--- a/.github/workflows/cflite_pr.yml
+++ b/.github/workflows/cflite_pr.yml
@@ -23,7 +23,6 @@ jobs:
       matrix:
         sanitizer: [address, undefined, memory]
     steps:
-    - run: sudo sysctl -w vm.mmap_rnd_bits=28
     - name: Build Fuzzers
       id: build
       uses: google/clusterfuzzlite/actions/build_fuzzers@v1
diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml
index 3aaaa3fd751..a12ad9335f9 100644
--- a/.github/workflows/cifuzz.yml
+++ b/.github/workflows/cifuzz.yml
@@ -39,7 +39,6 @@ jobs:
       security-events: write
 
     steps:
-      - run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Build Fuzzers
         id: build
         uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 9942df6be2c..4c398e9eaeb 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -31,9 +31,6 @@ jobs:
     steps:
       - name: Repository checkout
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
-      # FIXME: drop once https://github.com/actions/runner-images/issues/9491  is resolved
-      - name: Reduce ASLR entropy
-        run: sudo sysctl -w vm.mmap_rnd_bits=28
       - name: Install build dependencies
         run: |
           # Drop XDG_* stuff from /etc/environment, so we don't get the user