From 38bc58856e496076940efee9ca773a74c878d67a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 15 Mar 2022 13:03:44 +0000
Subject: [PATCH 1/2] Move CI to GitHub Actions

---
 .github/workflows/ci.yml | 18 ++++++++++++++++++
 .travis.yml              | 11 -----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..ede1d85f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,18 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: docker pull jmadler/python-future-builder:latest
+      - run: ./build.sh
+      - run: ./lint.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3fe6a983..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: generic
-
-services:
-    - docker
-
-before_script:
-    - docker pull jmadler/python-future-builder:latest
-
-script:
-  - ./build.sh
-  - ./lint.sh

From c3f7a8165bdcd6ff853d35e8ca56d42f8d6b36c1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 15 Mar 2022 13:35:49 +0000
Subject: [PATCH 2/2] Update build badge

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 1ab43e53..cce7605c 100644
--- a/README.rst
+++ b/README.rst
@@ -3,8 +3,8 @@
 Overview: Easy, clean, reliable Python 2/3 compatibility
 ========================================================
 
-.. image:: https://travis-ci.org/PythonCharmers/python-future.svg?branch=master
-    :target: https://travis-ci.org/PythonCharmers/python-future
+.. image:: https://github.com/PythonCharmers/python-future/actions/workflows/ci.yml/badge.svg?branch=master
+    :target: https://github.com/PythonCharmers/python-future/actions/workflows/ci.yml?query=branch%3Amaster
 
 .. image:: https://readthedocs.org/projects/python-future/badge/?version=latest
     :target: https://python-future.readthedocs.io/en/latest/?badge=latest