From 33fd45a9601c34c20e099a37be7cf827434d2fa7 Mon Sep 17 00:00:00 2001 From: Badlop Date: Tue, 25 May 2021 19:16:06 +0200 Subject: [PATCH] Remove .travis.yml as it's superseded by ci.yml (#3613) --- .travis.yml | 68 ------------------------------------------------- CONTRIBUTING.md | 4 +-- README.md | 3 +-- 3 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 13d946abd..000000000 --- a/.travis.yml +++ /dev/null @@ -1,68 +0,0 @@ -language: erlang - -otp_release: - - 19.3 - - 23.1.2 - -os: linux - -dist: xenial - -services: - - redis - - mysql - - postgresql - -before_install: - - sudo apt-get -qq update - - pip install --user coveralls-merge - -install: - - sudo apt-get -qq install libexpat1-dev libyaml-dev libpam0g-dev libsqlite3-dev libgd-dev libwebp-dev - -before_script: - # Ulimit: See Travis-CI issue report: https://github.com/travis-ci/travis-ci/issues/3328 - - mysql -u root -e "CREATE USER 'ejabberd_test'@'localhost' IDENTIFIED BY 'ejabberd_test';" - - mysql -u root -e "CREATE DATABASE ejabberd_test;" - - mysql -u root -e "GRANT ALL ON ejabberd_test.* TO 'ejabberd_test'@'localhost';" - - mysql -u root ejabberd_test < sql/mysql.sql - - psql -U postgres -c "CREATE USER ejabberd_test WITH PASSWORD 'ejabberd_test';" - - psql -U postgres -c "CREATE DATABASE ejabberd_test;" - - psql -U postgres ejabberd_test -f sql/pg.sql - - psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE ejabberd_test TO ejabberd_test;" - - psql -U postgres ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ejabberd_test;" - - psql -U postgres ejabberd_test -c "GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ejabberd_test;" - -cache: - directories: - - deps/ - -script: - - ./autogen.sh - - ./configure --prefix=/tmp/ejabberd --enable-all --disable-odbc --disable-elixir - - make update - - make - - make install -s - - make xref - - ./tools/hook_deps.sh ebin - - sed -i -e 's/ct:pal/ct:log/' test/suite.erl - - ln -sf ../sql priv/ - - echo "" >> rebar.config - - echo '{ct_extra_params, "-verbosity 20"}.' >> rebar.config - - escript ./rebar skip_deps=true ct -v - - grep -q 'TEST COMPLETE,.* 0 failed' logs/raw.log - - test $(find logs -empty -name error.log) - -after_script: - - find logs -name suite.log -exec cat '{}' ';' - -after_failure: - - find logs -name exunit.log -exec cat '{}' ';' - - find logs -name ejabberd.log -exec cat '{}' ';' - - find logs -name suite.log -exec cat '{}' ';' | awk 'BEGIN{RS="\n=case";FS="\n"} /=result\s*failed/ {print "=case" $0}' - -after_success: - - coveralls-merge erlang.json - -notifications: - email: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a381bc072..136ef3077 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -96,10 +96,10 @@ Before you submit your pull request consider the following guidelines: git push origin my-fix-branch ``` -* In GitHub, send a pull request to `ejabberd:master`. This will trigger the Travis integration and run the test. +* In GitHub, send a pull request to `ejabberd:master`. This will trigger the automated testing. We will also notify you if you have not yet signed the [contribution agreement][cla]. -* If you find that the Travis integration has failed, look into the logs on Travis to find out +* If you find that the tests have failed, look into the logs to find out if your changes caused test failures, the commit message was malformed etc. If you find that the tests failed or times out for unrelated reasons, you can ping a team member so that the build can be restarted. diff --git a/README.md b/README.md index 7360fb2e5..35b15920b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ ejabberd Community Edition ========================== -[![Build Status](https://travis-ci.org/processone/ejabberd.svg?branch=master "Common Tests in Travis")](https://travis-ci.org/processone/ejabberd) -[![Dialyzer](https://github.com/processone/ejabberd/actions/workflows/tests.yml/badge.svg "Dialyzer tests in Github Actions")](https://github.com/processone/ejabberd/actions/workflows/tests.yml) +[![CI](https://github.com/processone/ejabberd/actions/workflows/ci.yml/badge.svg)](https://github.com/processone/ejabberd/actions/workflows/ci.yml) [![Coverage Status](https://coveralls.io/repos/github/processone/ejabberd/badge.svg?branch=master "Coverage in coveralls.io")](https://coveralls.io/github/processone/ejabberd?branch=master) [![Translation status](https://hosted.weblate.org/widgets/ejabberd/-/ejabberd-po/svg-badge.svg "Translation status in Weblate")](https://hosted.weblate.org/projects/ejabberd/ejabberd-po/) [![Hex version](https://img.shields.io/hexpm/v/ejabberd.svg "Hex version")](https://hex.pm/packages/ejabberd)