Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/build-and-test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,21 @@ jobs:
build-dnsdist:
name: build dnsdist
if: ${{ !github.event.schedule || vars.SCHEDULED_JOBS_BUILD_AND_TEST_ALL }}
runs-on: ${{ ( vars.REPOSITORY_USE_UBICLOUD == '1' ) && 'ubicloud-standard-4-ubuntu-2404' || 'ubuntu-24.04' }}
runs-on: ${{ ( vars.REPOSITORY_USE_UBICLOUD == '1' ) && 'ubicloud-standard-4-ubuntu-2404' || format('ubuntu-24.04{0}', matrix.architecture_suffix) }}
needs: get-runner-container-image
strategy:
matrix:
builder: [autotools, meson]
sanitizers: [asan+ubsan, tsan]
features: [least, full]
architecture_suffix: ['', '-arm']
exclude:
- sanitizers: tsan
features: least
- architecture_suffix: '-arm'
builder: autotools
- architecture_suffix: '-arm'
features: least
fail-fast: false
container:
image: "${{ needs.get-runner-container-image.outputs.id }}:${{ needs.get-runner-container-image.outputs.tag }}"
Expand Down Expand Up @@ -268,8 +273,8 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.ccache
key: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}-ccache-${{ steps.get-stamp.outputs.stamp }}
restore-keys: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}-ccache-
key: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}${{ matrix.architecture_suffix }}-ccache-${{ steps.get-stamp.outputs.stamp }}
restore-keys: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}${{ matrix.architecture_suffix }}-ccache-
- name: install pip build dependencies
run: |
python3 -m venv ${REPO_HOME}/.venv
Expand Down Expand Up @@ -321,7 +326,7 @@ jobs:
if: ${{ matrix.builder == 'meson' }}
uses: actions/upload-artifact@v4 # this takes 30 seconds, maybe we want to tar
with:
name: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}-${{ env.normalized-branch-name }}
name: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}${{ matrix.architecture_suffix }}-${{ env.normalized-branch-name }}
path: /opt/dnsdist
retention-days: 1

Expand Down
8 changes: 7 additions & 1 deletion tasks.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
import time
import json
import platform
import requests
from invoke import task
from invoke.exceptions import Failure, UnexpectedExit
Expand Down Expand Up @@ -454,6 +455,12 @@ def get_optimizations():
optimizations = os.getenv('OPTIMIZATIONS', 'yes')
return '-O1' if optimizations == 'yes' else '-O0'

def get_protections():
if platform.machine() in ['aarch64', 'arm64']:
return "-fcf-protection=check",
return "-fcf-protection=full",


def get_cflags():
return " ".join([
get_optimizations(),
Expand All @@ -463,7 +470,6 @@ def get_cflags():
"-Werror=format-security",
"-fstack-clash-protection",
"-fstack-protector-strong",
"-fcf-protection=full",
"-Werror=string-plus-int" if is_compiler_clang() else '',
])

Expand Down