diff options
| author | Airtower <fiona.klute@gmx.de> | 2021-01-08 07:42:06 +0000 |
|---|---|---|
| committer | Airtower <fiona.klute@gmx.de> | 2021-01-08 07:42:06 +0000 |
| commit | 6a6a3d4f6825d053933872d8d441417704bbdf03 (patch) | |
| tree | 511272056d373c98f1e4d0415508590e243c4155 | |
| parent | f6b4695ccafd6945cc7affda4ab9f7b9f9ed8616 (diff) | |
| parent | f62a768a4f8e96560b6288d6cb75fbe007f5ee3c (diff) | |
| download | gnutls-6a6a3d4f6825d053933872d8d441417704bbdf03.tar.gz | |
Merge branch 'github-macos' into 'master'
Use Github Actions for MacOS CI
Closes #1140
See merge request gnutls/gnutls!1375
| -rw-r--r-- | .github/workflows/macos.yml | 43 | ||||
| -rw-r--r-- | .travis.yml | 49 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/gnutls.texi | 4 |
4 files changed, 46 insertions, 52 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml new file mode 100644 index 0000000000..37928cc398 --- /dev/null +++ b/.github/workflows/macos.yml @@ -0,0 +1,43 @@ +name: MacOS CI +on: + push: + +jobs: + build: + runs-on: macos-11.0 + steps: + - uses: actions/checkout@v2 + with: + submodules: false + - name: install dependencies + run: | + brew update + for pkg in openssl autoconf automake autogen libtool nettle p11-kit libtasn1 gettext bison; do + brew install $pkg || true + done + for pkg in nettle wget p11-kit libtasn1; do + brew upgrade $pkg || true + done + - name: update path + run: | + echo /usr/local/opt/gettext/bin >>${GITHUB_PATH} + echo /usr/local/opt/bison/bin >>${GITHUB_PATH} + - name: bootstrap + run: ./bootstrap + - name: configure + run: | + CC=clang ./configure --disable-full-test-suite --disable-valgrind-tests --disable-doc --disable-guile --disable-dependency-tracking + - name: make + run: | + make -j$(sysctl -n hw.ncpu) || make -j$(sysctl -n hw.ncpu) V=1 + - name: make check + run: | + make -j$(sysctl -n hw.ncpu) check gl_public_submodule_commit= + - name: show debug info + if: failure() + run: | + find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \; + for i in $(ls tests/*.log fuzz/*.log); do + echo "" && echo $i && cat $i + done + cat config.log diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 02f641b6a4..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,49 +0,0 @@ -os: - - osx - -osx_image: - # MacOS X 10.15.4 - - xcode11.5 - # MacOS X 10.14.6 - - xcode11.3 - # MacOS X 10.13 - - xcode10.1 - # MacOS X 10.13, Default - - xcode9.4 - -language: c -compiler: - - clang - -git: - submodules: false - -notifications: - email: - on_success: change - on_failure: always - - -before_install: - - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then - brew update; - for pkg in openssl autoconf automake autogen libtool nettle p11-kit libtasn1 gettext bison;do - brew install $pkg || true; - done; - for pkg in nettle wget p11-kit libtasn1;do - brew upgrade $pkg || true; - done; - fi - -script: - - export PATH="/usr/local/opt/gettext/bin:$PATH" - - export PATH="/usr/local/opt/bison/bin:$PATH" - - ./bootstrap - - ./configure --disable-full-test-suite --disable-valgrind-tests --disable-doc --disable-guile --disable-dependency-tracking - - make -j$(sysctl -n hw.ncpu) || make -j$(sysctl -n hw.ncpu) V=1 - - make -j$(sysctl -n hw.ncpu) check gl_public_submodule_commit= - -after_failure: - - find . -name 'test-suite.log' -execdir grep -il "FAILED" {} \; -exec echo {} \; -exec cat {} \; - - for i in tests/*.log fuzz/*.log;do echo "" && echo $i && cat $i;done - - cat config.log @@ -3,7 +3,7 @@ |Branch|CI system|Status|Test suite coverage|Fuzzer coverage| |:----:|:-------:|-----:|:------:|:-------------:| |Master/3.6.x|Gitlab|[](https://gitlab.com/gnutls/gnutls/commits/master)|[](https://gnutls.gitlab.io/coverage/master)|[](https://gnutls.gitlab.io/coverage/master-fuzz)| -|Master/3.6.x|Travis|[](https://travis-ci.org/gnutls/gnutls)|N/A|N/A| +|Master/3.6.x|Github Actions|[](https://github.com/gnutls/gnutls/actions)|N/A|N/A| # GnuTLS -- Information for developers diff --git a/doc/gnutls.texi b/doc/gnutls.texi index b2291a6867..4de9de79cf 100644 --- a/doc/gnutls.texi +++ b/doc/gnutls.texi @@ -16,8 +16,8 @@ This manual is last updated @value{UPDATED} for version @value{VERSION} of GnuTLS. -Copyright @copyright{} 2001-2020 Free Software Foundation, Inc.\\ -Copyright @copyright{} 2001-2020 Nikos Mavrogiannopoulos +Copyright @copyright{} 2001-2021 Free Software Foundation, Inc.\\ +Copyright @copyright{} 2001-2021 Nikos Mavrogiannopoulos @quotation Permission is granted to copy, distribute and/or modify this document |