summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoey Prat <roey.prat@redislabs.com>2020-11-09 18:20:40 +0200
committerRoey Prat <roey.prat@redislabs.com>2020-11-09 18:49:44 +0200
commitec076c63f81f0a9edf63d4de40ec778dc484bdaa (patch)
tree47b6b71bb6e2cf3170d49d58fdbbaf9f5e9f0259
parent8c176cdc7f36e2cbcd3254768766035a7b7cd8b3 (diff)
downloadredis-py-roey/github-actions.tar.gz
use github actions instead of travis-CIroey/github-actions
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md2
-rw-r--r--.github/workflows/integration.yaml15
-rw-r--r--.travis.yml14
-rw-r--r--README.rst4
-rw-r--r--docker-compose.yml10
-rwxr-xr-xdocker-entry.sh2
-rw-r--r--tox.ini3
7 files changed, 21 insertions, 29 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3b8e7ba..2bbc804 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,7 @@
_Please make sure to review and check all of these items:_
- [ ] Does `$ tox` pass with this change (including linting)?
-- [ ] Does travis tests pass with this change (enable it first in your forked repo and wait for the travis build to finish)?
+- [ ] Do the CI tests pass with this change (enable it first in your forked repo and wait for the github action build to finish)?
- [ ] Is the new or changed code fully tested?
- [ ] Is a documentation update included (if this change modifies existing APIs, or introduces new ones)?
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
new file mode 100644
index 0000000..8cb4af9
--- /dev/null
+++ b/.github/workflows/integration.yaml
@@ -0,0 +1,15 @@
+name: CI
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ integration:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: test
+ run: make test
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4b09cfc..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-env:
- - DOCKER_COMPOSE_VERSION=1.26.2
-
-before_install:
- - sudo rm /usr/local/bin/docker-compose
- - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- - chmod +x docker-compose
- - sudo mv docker-compose /usr/local/bin
-
-services:
- - docker
-
-script:
- - make test
diff --git a/README.rst b/README.rst
index b71c760..43a7de0 100644
--- a/README.rst
+++ b/README.rst
@@ -3,8 +3,8 @@ redis-py
The Python interface to the Redis key-value store.
-.. image:: https://secure.travis-ci.org/andymccurdy/redis-py.svg?branch=master
- :target: https://travis-ci.org/andymccurdy/redis-py
+.. image:: https://github.com/andymccurdy/redis-py/workflows/CI/badge.svg?branch=master
+ :target: https://github.com/andymccurdy/redis-py/actions?query=workflow%3ACI+branch%3Amaster
.. image:: https://readthedocs.org/projects/redis-py/badge/?version=stable&style=flat
:target: https://redis-py.readthedocs.io/en/stable/
.. image:: https://badge.fury.io/py/redis.svg
diff --git a/docker-compose.yml b/docker-compose.yml
index 247688a..103a51b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,15 +50,7 @@ services:
CODECOV_TOKEN:
CODECOV_URL:
SHIPPABLE:
- TRAVIS:
- TRAVIS_BRANCH:
- TRAVIS_COMMIT:
- TRAVIS_JOB_ID:
- TRAVIS_JOB_NUMBER:
- TRAVIS_OS_NAME:
- TRAVIS_PULL_REQUEST:
- TRAVIS_REPO_SLUG:
- TRAVIS_TAG:
+ GITHUB_ACTIONS:
VCS_BRANCH_NAME:
VCS_COMMIT_ID:
VCS_PULL_REQUEST:
diff --git a/docker-entry.sh b/docker-entry.sh
index f63a8c5..dc119dc 100755
--- a/docker-entry.sh
+++ b/docker-entry.sh
@@ -9,7 +9,7 @@ REDIS_MASTER="${REDIS_MASTER_HOST}":"${REDIS_MASTER_PORT}"
echo "Testing against Redis Server: ${REDIS_MASTER}"
# skip the "codecov" env if not running on Travis
-if [ -z ${TRAVIS-} ]; then
+if [ "${GITHUB_ACTIONS}" = true ] ; then
echo "Skipping codecov"
export TOX_SKIP_ENV="codecov"
fi
diff --git a/tox.ini b/tox.ini
index c783bf0..19f9aad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,8 +43,7 @@ passenv =
CI_*
CODECOV_*
SHIPPABLE
- TRAVIS
- TRAVIS_*
+ GITHUB_*
VCS_*
[testenv:covreport]