[openssl] master update

Richard Levitte levitte at openssl.org
Mon Jan 25 12:43:32 UTC 2021


The branch master has been updated
       via  b897b353dff8138aa838bae9766ecd3de8c03280 (commit)
      from  4605b34d567c408c5b238b2d91f3fb4e022c9037 (commit)


- Log -----------------------------------------------------------------
commit b897b353dff8138aa838bae9766ecd3de8c03280
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Jan 24 08:42:52 2021 +0100

    Drop Travis
    
    At this point, we have transitioned completely from Travis to GitHub Actions
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13940)

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml     | 267 --------------------------------------------------------
 CONTRIBUTING.md |   6 +-
 README.md       |  14 +--
 3 files changed, 10 insertions(+), 277 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bda5b238b9..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,267 +0,0 @@
-dist: bionic
-
-osx_image: xcode9.3
-
-language: c
-cache: ccache
-git:
-    submodules: false
-    quiet: true
-
-before_install:
-    - if [ -n "$COVERALLS" ]; then
-          travis_retry pip install --user cpp-coveralls;
-      fi;
-    - if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then
-          travis_retry git submodule update --init --recursive;
-      fi;
-    - eval "${MATRIX_EVAL}"
-
-arch:
-    - amd64
-
-os:
-    - linux
-    - osx
-
-compiler:
-    - clang
-    - gcc
-
-env:
-    # Note: env entry here must exactly match the value in the exclude: table below that contains env:, otherwise it will not find a match.
-    - CONFIG_OPTS="" DESTDIR="_install"
-    - CONFIG_OPTS="no-asm --debug --strict-warnings no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1"
-    - CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
-
-jobs:
-    exclude:
-        - os: linux
-          compiler: clang
-          env: CONFIG_OPTS="" DESTDIR="_install"
-        - os: linux
-          compiler: clang
-          env: CONFIG_OPTS="no-asm no-makedepend enable-buildtest-c++ --strict-warnings --with-rand-seed=rdcpu,os -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
-        - os: osx
-          compiler: gcc
-        - os: osx
-          env: CONFIG_OPTS="no-asm --debug --strict-warnings no-afalgeng no-shared enable-rc5 enable-md2 -fsanitize=address" LSAN_OPTIONS="report_objects=1"
-    include:
-        - os: linux
-          arch: arm64
-          compiler: gcc
-          env: CONFIG_OPTS="--strict-warnings" MAKEVERBOSE="yes"
-        - os: linux
-          arch: arm64
-          compiler: gcc
-          env: CONFIG_OPTS="no-asm no-makedepend no-deprecated enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" GENERATE="yes" CPPFLAGS="-ansi"
-        - os: linux
-          arch: s390x
-          compiler: gcc
-          env: CONFIG_OPTS="--strict-warnings"
-        - os: linux-ppc64le
-          compiler: gcc
-          env: CONFIG_OPTS="--strict-warnings"
-        - os: linux
-          compiler: gcc
-          env: CONFIG_OPTS="--strict-warnings no-ec enable-trace enable-ssl-trace enable-zlib enable-zlib-dynamic enable-crypto-mdebug enable-crypto-mdebug-backtrace enable-egd" COMMENT="Move to the BORINGTEST build when interoperable"
-        - os: linux
-          dist: trusty
-          compiler: clang
-          env: CONFIG_OPTS="--strict-warnings -D__NO_STRING_INLINES"
-        - os: linux
-          dist: xenial
-          compiler: gcc
-          env: CONFIG_OPTS="--strict-warnings no-deprecated enable-rc5 enable-md2"
-        - os: linux
-          addons:
-              apt:
-                  packages:
-                      - binutils-mingw-w64
-                      - gcc-mingw-w64
-          compiler: i686-w64-mingw32-gcc
-          env: CONFIG_OPTS="no-stdio" BUILDONLY="yes"
-        - os: linux
-          addons:
-              apt:
-                  packages:
-                      - golang-1.10
-          compiler: gcc
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug --coverage no-asm enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-ssl3 enable-ssl3-method enable-nextprotoneg enable-weak-ssl-ciphers no-shared enable-buildtest-c++ -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION" COVERALLS="yes" BORINGSSL_TESTS="yes" CXX="g++"
-        - os: linux
-          addons:
-              apt:
-                  packages:
-                      - golang-1.10
-                      - cmake
-                      - libtest2-suite-perl
-          compiler: gcc
-          # External test pyca-cryptography temporarily disabled due to long term travis failures
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="--debug enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-external-tests enable-buildtest-c++" BORINGSSL_TESTS="yes" CXX="g++" TESTS="test_external_boringssl test_external_krb5 test_external_gost_engine"
-        - os: linux
-          compiler: clang
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="enable-msan disable-afalgeng -Wno-unused-command-line-argument"
-        - os: linux
-          compiler: clang
-          env:  EXTENDED_TEST="yes" CONFIG_OPTS="no-asm enable-ubsan enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-nextprotoneg no-shared enable-buildtest-c++ -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -Wno-unused-command-line-argument" CXX="clang++"
-        - os: linux
-          compiler: gcc
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="--debug no-asm enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-buildtest-c++" OPENSSL_TEST_RAND_ORDER=0
-        - os: linux
-          dist: xenial
-          addons:
-              apt:
-                  packages:
-                      - binutils-mingw-w64
-                      - gcc-mingw-w64
-          compiler: i686-w64-mingw32-gcc
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic"
-        - os: linux
-          dist: xenial
-          addons:
-              apt:
-                  packages:
-                      - binutils-mingw-w64
-                      - gcc-mingw-w64
-          compiler: x86_64-w64-mingw32-gcc
-          env: EXTENDED_TEST="yes" CONFIG_OPTS="no-pic"
-        - os: linux
-          language: python
-          python: 3.7
-          install: pip install flake8
-          before_script:
-            # stop the build if there are Python syntax errors or undefined names
-            - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-            # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
-            - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-          script: true
-        - os: linux
-          compiler: gcc
-          env: CONFIGURE_TARGET="linux-generic32" MARKDOWNLINT="yes" CONFIG_OPTS="no-bulk no-pic no-asm -DOPENSSL_SMALL_FOOTPRINT --strict-warnings no-pic -DOPENSSL_NO_SECURE_MEMORY"
-
-before_script:
-    - env
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" -a -n "$EXTENDED_TEST" ]; then
-          (git log -1 $TRAVIS_COMMIT_RANGE | grep '\[extended tests\]' > /dev/null) || travis_terminate 0;
-      fi
-    - if [ -n "$DESTDIR" ]; then
-          sh .travis-create-release.sh $TRAVIS_OS_NAME;
-          tar -xzf _srcdist.tar.gz;
-          mkdir -p _build/tree;
-          cd _build/tree;
-          srcdir=../../_srcdist;
-          top=../..;
-      else
-          srcdir=.;
-          top=.;
-      fi
-    - if [ "$CC" = i686-w64-mingw32-gcc ]; then
-          export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
-      elif [ "$CC" = x86_64-w64-mingw32-gcc ]; then
-          export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
-      else
-          if which ccache >/dev/null && test "$BORINGSSL_TESTS" != yes; then
-              CC="ccache $CC";
-          fi;
-          if [ -n "$CONFIGURE_TARGET" ]; then
-              $srcdir/Configure $CONFIGURE_TARGET $CONFIG_OPTS;
-          else
-              $srcdir/config -v $CONFIG_OPTS;
-          fi;
-      fi
-    - ./configdata.pm --dump
-    - export BUILDOPTS="-j4"
-    - export HARNESS_JOBS=${HARNESS_JOBS:-4}
-    - cd $top
-
-script:
-    - if [ -z "$BUILDONLY" ] && [ -z "$MAKEVERBOSE" ] ; then
-          make="make -s";
-      else
-          make="make";
-      fi
-    - if [ -n "$GENERATE" ]; then
-          make2="$make $BUILDOPTS PERL=no-perl";
-      else
-          make2="$make $BUILDOPTS";
-      fi
-    - top=${PWD}
-    - if [ -n "$DESTDIR" ]; then
-          cd _build/tree;
-      fi
-    - if ! $make update; then
-          echo -e '\052\052 FAILED -- MAKE UPDATE';
-          travis_terminate 1;
-      fi
-    - if ! git diff --exit-code; then
-          echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITTED';
-          travis_terminate 1;
-      fi
-    - if test -n "$GENERATE" && ! $make build_all_generated; then
-          echo -e '\052\052 FAILED -- MAKE BUILD_ALL_GENERATED';
-          travis_terminate 1;
-      fi
-    - if test -n "$CHECKDOCS" && ! $make doc-nits; then
-          echo -e '\052\052 FAILED -- MAKE DOC-NITS';
-          travis_terminate 1;
-      fi
-    - if test -n "$MARKDOWNLINT" ; then
-          if ! gem install mdl ; then
-              echo -e '\052\052 FAILED -- GEM INSTALL MDL';
-              travis_terminate 1;
-          fi;
-          if ! $make md-nits ; then
-              echo -e '\052\052 FAILED -- MAKE MD-NITS';
-              travis_terminate 1;
-          fi;
-      fi
-    - if ! $make2; then
-          echo -e '\052\052 FAILED -- MAKE';
-          travis_terminate 1;
-      fi;
-    - if test -n "$CHECKDOCS" && ! $make cmd-nits; then
-          echo -e '\052\052 FAILED -- MAKE CMD-NITS';
-          travis_terminate 1;
-      fi
-    - if [ -z "$BUILDONLY" ]; then
-          if [ -n "$CROSS_COMPILE" ]; then
-              sudo dpkg --add-architecture i386;
-              sudo apt-get update;
-              sudo apt-get -yq --no-install-suggests --no-install-recommends --force-yes install wine;
-              export EXE_SHELL="wine" WINEPREFIX=`pwd`;
-          fi;
-          if [ -e krb5/src ]; then
-              sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh;
-          fi;
-          if ! HARNESS_VERBOSE_FAILURE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner travis_wait 60 make _tests; then
-              echo -e '\052\052 FAILED -- MAKE TEST';
-              travis_terminate 1;
-          fi;
-      else
-          if ! $make build_tests >~/build.log 2>&1; then
-              echo -e '\052\052 FAILED -- MAKE BUILD_TESTS';
-              cat ~/build.log
-              travis_terminate 1;
-          fi;
-      fi
-    - if [ -n "$DESTDIR" ]; then
-          mkdir "$top/$DESTDIR";
-          if ! $make install DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then
-              echo -e '\052\052 FAILED -- MAKE INSTALL';
-              cat ~/install.log;
-              travis_terminate 1;
-          fi;
-      fi
-    - cd $top
-    - echo -e '\052\052 DONE'
-
-after_success:
-    - if [ -n "$COVERALLS" ]; then
-          coveralls -b . --gcov gcov --gcov-options '\-lpbc';
-      fi;
-
-notifications:
-    email:
-        secure: "xeGNgWO7aoaDgRvcZubposqMsj36aU8c6F0oHfw+rUqltCQ14IgYCUwzocmR2O+Pa7B3Cx5VjMfBFHbQaajZsfod8vu7g+aGq/zkjwbhsr/SR4dljJjFJXLGZjIalm9KgP6KInmVDuINfCqP+MHIY5lZkNI7DMcyHDhVc5nSKvCXV7xTDNgmstvh8rB/z51WfHDqGqfBtiuK5FDNxmvYK8OFJ5W94Lu9LDlizcxwK3GAj7arOui7Z5w8bQ6p4seUE3IvJL1Zbj0pZHxvNb6Zeb2Pn8QF1qLlN8YmBktD4aiw0ce4wYRiL87uLgcOxZY7SVXtv2XYFIYWapU/FKjCqa6vK93V/H9eZWEIYNMKnN3wXm2beqVdnKek3OeGJ8v0y7MbSfuLfRtBqbTSNYnpU1Zuo4MQAvHvEPuwCAYkYQajOSRplMH5sULFKptuVqNtOMfjL8jHb8AEoL1acYIk43ydxeYrzzas4fqgCDJ52573/u0RNdF1lkQBLkuM365OB8VRqtpnoxcdEIY/qBc/8TzZ24fxyrs5qdHFcxGSgpN2EP6cJMqpvkemnCNSdhxUqfzm22N7a3O8+4LFSBGOnHto/PwdsvF/01yGYL0LoZTnoO1i6x7AMJPBh+eyDU0ZjGhj/msjmqeb9C8vRqQ+1WjHrIS1iqCD0Czib8tUPD4="
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d21aab0e6e..4910bd673c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -56,8 +56,8 @@ guidelines:
  4. Patches should follow our [coding style] and compile without warnings.
     Where `gcc` or `clang` is available you should use the
     `--strict-warnings` `Configure` option.  OpenSSL compiles on many varied
-    platforms: try to ensure you only use portable features.  Clean builds
-    via Travis and AppVeyor are required, and they are started automatically
+    platforms: try to ensure you only use portable features.  Clean builds via
+    GitHub Actions and AppVeyor are required, and they are started automatically
     whenever a PR is created or updated.
 
     [coding style]: https://www.openssl.org/policies/codingstyle.html
@@ -91,4 +91,4 @@ guidelines:
     specific release, to see if an upgrade is worth the effort.
 
  9. Guidelines how to integrate error output of new crypto library modules
-    can be found in [crypto/err/README.md](crypto/err/README.md).
\ No newline at end of file
+    can be found in [crypto/err/README.md](crypto/err/README.md).
diff --git a/README.md b/README.md
index ecee5400b3..8723f6369c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Welcome to the OpenSSL Project
 
 [![openssl logo]][www.openssl.org]
 
-[![travis badge]][travis jobs]
+[![github actions ci badge]][github actions ci]
 [![appveyor badge]][appveyor jobs]
 
 OpenSSL is a robust, commercial-grade, full-featured Open Source Toolkit
@@ -206,13 +206,13 @@ All rights reserved.
     doc/images/openssl.svg
     "OpenSSL Logo"
 
-[travis badge]:
-    <https://travis-ci.com/openssl/openssl.svg?branch=master>
-    "Travis Build Status"
+[github actions ci badge]:
+    <https://github.com/openssl/openssl/workflows/GitHub%20CI/badge.svg>
+    "GitHub Actions CI Status"
 
-[travis jobs]:
-    <https://travis-ci.com/openssl/openssl>
-    "Travis Jobs"
+[github actions ci]:
+    <https://github.com/openssl/openssl/actions?query=workflow%3A%22GitHub+CI%22>
+    "GitHub Actions CI"
 
 [appveyor badge]:
     <https://ci.appveyor.com/api/projects/status/8e10o7xfrg73v98f/branch/master?svg=true>


More information about the openssl-commits mailing list