diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 35a0586b44..438bc0988d 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -123,11 +123,6 @@ ninja --version for args in "${ARGS[@]}"; do SECONDS=0 - # The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings - # "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target" - # It can be safely removed from the CI since it isn't actually used anywhere to test anything. - find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+' - # mold < 1.1 does not support LTO. if dpkg --compare-versions "$(dpkg-query --showformat='${Version}' --show mold)" ge 1.1; then fatal "Newer mold version detected, please remove this workaround." diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index 562bafb614..e9a398c701 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -70,10 +70,6 @@ for phase in "${PHASES[@]}"; do mv /etc/machine-id /etc/machine-id.bak fi fi - # The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings - # "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target" - # It can be safely removed from the CI since it isn't actually used anywhere to test anything. - find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+' MESON_ARGS+=(--fatal-meson-warnings) run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true "${MESON_ARGS[@]}" build ninja -C build -v @@ -94,10 +90,6 @@ for phase in "${PHASES[@]}"; do MESON_ARGS+=(-Dskip-deps=true) fi fi - # The install_tag feature introduced in 0.60 causes meson to fail with fatal-meson-warnings - # "Project targeting '>= 0.53.2' but tried to use feature introduced in '0.60.0': install_tag arg in custom_target" - # It can be safely removed from the CI since it isn't actually used anywhere to test anything. - find . -type f -name meson.build -exec sed -i '/install_tag/d' '{}' '+' MESON_ARGS+=(--fatal-meson-warnings) run_meson -Dnobody-group=nogroup --werror -Dtests=unsafe -Db_sanitize=address,undefined "${MESON_ARGS[@]}" build ninja -C build -v