diff --git a/.github/workflows/address-sanitizer.yml b/.github/workflows/address-sanitizer.yml index a7550848..f333440e 100644 --- a/.github/workflows/address-sanitizer.yml +++ b/.github/workflows/address-sanitizer.yml @@ -27,8 +27,8 @@ jobs: - name: Install Dependencies run: | if [ -f /etc/fedora-release ]; then - dnf -y install git clang gcc automake libtool pkgconf-pkg-config \ - autoconf-archive openssl-devel openssl diffutils expect \ + dnf -y install git clang gcc pkgconf-pkg-config \ + openssl-devel openssl diffutils expect \ softhsm opensc p11-kit-devel p11-kit-server gnutls-utils \ nss-softokn nss-tools nss-softokn-devel \ dnf-command\(debuginfo-install\) libasan @@ -36,8 +36,8 @@ jobs: elif [ -f /etc/debian_version ]; then cat .github/sid.debug.list > /etc/apt/sources.list.d/debug.list apt-get -q update - apt-get -yq install git gcc clang make automake \ - libtool pkg-config autoconf-archive libssl-dev openssl expect \ + apt-get -yq install git gcc clang \ + pkg-config libssl-dev openssl expect \ procps libnss3 libnss3-tools libnss3-dev softhsm opensc p11-kit \ libp11-kit-dev p11-kit-modules gnutls-bin \ openssl-dbgsym libssl3-dbgsym @@ -47,16 +47,17 @@ jobs: # that is not compabitlbe with LD_PRELOAD so we force the absolute path. run: | if [ -f /etc/fedora-release ]; then - autoreconf -fiv CC=gcc \ - ./configure --with-address-sanitizer=/usr/lib64/libasan.so.8.0.0 + meson setup _build -Db_sanitize=address -Dpreload_libasan=/usr/lib64/libasan.so.8.0.0 elif [ -f /etc/debian_version ]; then autoreconf -fiv CC=gcc \ - ./configure --with-address-sanitizer + meson setup _build -Db_sanitize=address fi - name: Build and Test - run: make check + run: | + meson compile -C _build + meson test -C _build - uses: actions/upload-artifact@v3 if: failure() with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6bb89a23..5898df9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,8 @@ jobs: - name: Install Dependencies run: | if [ -f /etc/fedora-release ]; then - dnf -y install git ${{ matrix.compiler }} automake libtool \ - pkgconf-pkg-config autoconf-archive openssl-devel openssl \ + dnf -y install git ${{ matrix.compiler }} meson \ + pkgconf-pkg-config openssl-devel openssl \ diffutils expect valgrind if [ "${{ matrix.token }}" = "softokn" ]; then dnf -y install nss-softokn nss-tools nss-softokn-devel @@ -38,8 +38,8 @@ jobs: fi elif [ -f /etc/debian_version ]; then apt-get -q update - apt-get -yq install git ${{ matrix.compiler }} make automake \ - libtool pkg-config autoconf-archive libssl-dev openssl expect \ + apt-get -yq install git ${{ matrix.compiler }} \ + pkg-config libssl-dev openssl expect \ valgrind procps if [ "${{ matrix.token }}" = "softokn" ]; then apt-get -yq install libnss3 libnss3-tools libnss3-dev @@ -52,10 +52,11 @@ jobs: uses: actions/checkout@v3 - name: Setup run: | - autoreconf -fiv - CC=${{ matrix.compiler }} ./configure + CC=${{ matrix.compiler }} meson setup _build - name: Build and Test - run: make check + run: | + meson compile -C _build + meson test -C _build - uses: actions/upload-artifact@v3 if: failure() with: @@ -69,7 +70,7 @@ jobs: - name: Run tests with valgrind run: | if [ "${{ matrix.compiler }}" = "gcc" ]; then - make check-valgrind-memcheck + meson test -C _build --setup=valgrind fi - uses: actions/upload-artifact@v3 if: failure()