Skip to content

Commit

Permalink
Merge pull request #186 from k0ekk0ek/develop
Browse files Browse the repository at this point in the history
Remove unused CI recipes and extend GitHub workflow
  • Loading branch information
wtoorop authored Jul 12, 2024
2 parents 8f1640d + 41037cf commit 142988e
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 1,477 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/testsuite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:
- run: libtoolize -vci
- run: autoreconf -vfi
- run: ./configure
env:
CFLAGS: -g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover
- run: make test

mac:
Expand All @@ -37,6 +39,8 @@ jobs:
# macOS’s system OpenSSL (LibreSSL, actually) isn’t meant for linking,
# and Homebrew’s# OpenSSL isn’t CI-friendly. So build without OpenSSL.
- run: ./configure --without-ssl --disable-sha2 --disable-gost --disable-ecdsa --disable-dane
env:
CFLAGS: -g2 -O0 -fsanitize=address,undefined -fno-sanitize-recover
- run: make test

# Pending https://github.com/NLnetLabs/ldns/issues/197,
Expand Down Expand Up @@ -89,6 +93,7 @@ jobs:
- name: "${{ matrix.platform }}: Build and test"
run: docker run --rm --interactive --mount type=bind,source=$(pwd),target=/host ${{ matrix.platform }}/alpine sh -c "apk add make gcc libc-dev libtool automake autoconf openssl-dev m4 indent bash bind-tools && cd /host && libtoolize -vci && autoreconf -vfi && ./configure && make test"


# BSDs:
# name: ${{ matrix.os.dispname }} ${{ matrix.os.version }}
#
Expand Down
6 changes: 0 additions & 6 deletions .gitlab-ci.yml

This file was deleted.

291 changes: 0 additions & 291 deletions .travis.yml

This file was deleted.

3 changes: 2 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ setup-builddir:

# builddir/ is used by 60-compile-builddir
putdown-builddir:
rm -f include/ldns lib config.h
rm -rf include/ldns
rm -f lib config.h
test ! -d include || rmdir include || :
if test -d examples -a ! -f examples/README; then rmdir examples || : ; fi
if test -d drill -a ! -f drill/README ; then rmdir drill || : ; fi
Expand Down
Loading

0 comments on commit 142988e

Please sign in to comment.