mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'mnowak/revert-05b09f2b5bb68a916288f56bf627babad4055b90' into 'main'

Browse Source 
Revert "Work around a TSAN issue with newer kernels"

Closes #4649

See merge request isc-projects/bind9!8905
This commit is contained in:
Michal Nowak
2024-03-25 13:45:39 +00:00
parent af220a5b72 aba16af556
commit f0800501c7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -311,7 +311,6 @@ stages:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: build stage: build
before_script: before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}" - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
- test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}" - test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script: script:
@@ -370,7 +369,6 @@ stages:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: system stage: system
before_script: before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -n "${OUT_OF_TREE_WORKSPACE}" && cp -r bin/tests/system/* "${OUT_OF_TREE_WORKSPACE}/bin/tests/system/" && cd "${OUT_OF_TREE_WORKSPACE}" - test -n "${OUT_OF_TREE_WORKSPACE}" && cp -r bin/tests/system/* "${OUT_OF_TREE_WORKSPACE}/bin/tests/system/" && cd "${OUT_OF_TREE_WORKSPACE}"
- *setup_interfaces - *setup_interfaces
script: script:
@@ -432,7 +430,6 @@ stages:
<<: *default_triggering_rules <<: *default_triggering_rules
stage: unit stage: unit
before_script: before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}" - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script: script:
- make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1 - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
@@ -481,7 +478,6 @@ stages:
.respdiff: &respdiff_job .respdiff: &respdiff_job
stage: system stage: system
before_script: before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- autoreconf -fi - autoreconf -fi
- *configure - *configure
- make -j${BUILD_PARALLEL_JOBS:-1} V=1 - make -j${BUILD_PARALLEL_JOBS:-1} V=1