diff options
| author | Joe Orton <jorton@redhat.com> | 2021-06-30 13:20:47 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2021-06-30 13:33:41 +0100 |
| commit | bb8418f2d41d31611da644b6a9aaf5081dfd28b6 (patch) | |
| tree | 82b3000252aab60eddd1a753c9ae5e4764b1a332 | |
| parent | e5317066e432880a8bb8b81d33b8612bca49c88d (diff) | |
| download | neon-git-actions-matrix.tar.gz | |
Add GitHub Actions CI matrix, replacing a bunch of Travis tests.actions-matrix
| -rw-r--r-- | .github/workflows/ci.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 14 |
2 files changed, 9 insertions, 17 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d369427..d7c69fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,14 +1,20 @@ -name: Test workflow +name: Build and test on: [push, pull_request] jobs: build: + strategy: + fail-fast: false + matrix: + conf-shared: [--enable-static, --enable-shared ] + conf-xml: [--with-expat, --with-libxml2, ] + conf-ssl: [--without-ssl, --with-ssl=openssl] + conf-memleak: [--disable-memleak, --enable-memleak ] runs-on: ubuntu-latest - steps: - uses: actions/checkout@v2 - run: ./autogen.sh - - run: ./configure + - run: ./configure ${{matrix.conf-shared}} ${{matrix.conf-xml}} ${{matrix.conf-ssl}} ${{matrix.conf-memleak}} - run: make - run: make check diff --git a/.travis.yml b/.travis.yml index 45a665e..62bda48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,8 @@ env: - MARGS="-j2 check" matrix: include: - - name: Static - env: CONF="--enable-static" - - name: Shared - env: CONF="--enable-shared" - name: Disable-all env: CONF="--without-libproxy --without-gssapi --without-zlib --disable-nls --disable-debug --disable-webdav" - - name: Memleak - env: CONF="--enable-memleak" - - name: Libxml2 - env: CONF="--with-libxml2" - name: Static UBSan w/OpenSSL env: CONF="--enable-static --with-ssl=openssl" CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" LIBS=-lubsan NEON_LIBS=-lubsan - name: Static 32-bit w/OpenSSL @@ -37,8 +29,6 @@ matrix: - libexpat1-dev:i386 - libssl-dev:i386 - lib32z1-dev - - name: OpenSSL - env: CONF="--with-ssl=openssl" - name: OpenSSL on arm64 arch: arm64 env: CONF="--with-ssl=openssl" @@ -58,8 +48,6 @@ matrix: - name: OpenSSL on focal dist: focal env: CONF="--with-ssl=openssl" - - name: OpenSSL memleak - env: CONF="--with-ssl=openssl --enable-memleak" - name: GnuTLS env: CONF="--with-ssl=gnutls" - name: GnuTLS on bionic @@ -71,8 +59,6 @@ matrix: - name: GnuTLS on focal dist: focal env: CONF="--with-ssl=gnutls" - - name: GnuTLS memleak - env: CONF="--with-ssl=gnutls --enable-memleak" - name: Copyright check env: CONF="--without-libproxy --without-gssapi --without-zlib --disable-nls --disable-debug --disable-webdav" MARGS="update-copyright" allow_failures: |