From 1b9ab22c79fbe196cf0430ae18c585cc8c1b6d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Thu, 15 Dec 2022 23:02:24 +0100
Subject: [PATCH 1/2] Bump freetype-sys verion to 0.17.0

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 900886b..d79ab9f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ path = "lib.rs"
 
 [dependencies]
 expat-sys = "2.1.0"
-freetype-sys = "0.13.0"
+freetype-sys = "0.17.0"
 
 [build-dependencies]
 pkg-config = "0.3"

From 436d57bae9a151f184346b6a86702a975c4ea773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= <marcel.cochem@googlemail.com>
Date: Thu, 15 Dec 2022 23:13:33 +0100
Subject: [PATCH 2/2] switch from travis to github actions, fixes #68

---
 .github/workflows/ci.yml | 55 ++++++++++++++++++++++++++++++++++++++++
 .travis.yml              |  5 ----
 build.rs                 |  2 +-
 3 files changed, 56 insertions(+), 6 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 0000000..45f1369
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+env:
+  RUSTFLAGS: -Cdebuginfo=0
+  CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0
+  RUST_BACKTRACE: 1
+
+jobs:
+  tests:
+    name: Tests
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.toolchain == 'nightly' }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        toolchain: [stable, 1.60.0]
+    steps:
+      - uses: actions/checkout@v2
+
+      # install the toolchain we are going to compile and test with
+      - name: install ${{ matrix.toolchain }} toolchain
+        id: install_toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.toolchain }}
+          profile: minimal
+          override: true
+
+      # we want to install the latest nightly with clippy and rustfmt to run checks against stable
+      - name: install nightly toolchain
+        id: install_nightly_toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          components: clippy, rustfmt
+        if: matrix.toolchain == 'stable' && matrix.os == 'ubuntu-latest'
+
+      # run rustfmt and clippy checks, but only once
+      - run: cargo +nightly fmt --all -- --check
+        if: matrix.toolchain == 'stable' && matrix.os == 'ubuntu-latest'
+
+      #- run: cargo +nightly clippy -Z unstable-options --workspace --all-targets --all-features
+      #  if: matrix.toolchain == 'stable' && matrix.os == 'ubuntu-latest'
+
+      # run tests
+      - run: cargo test --verbose
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 023b136..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: rust
-sudo: false
-branches:
-  except:
-    - master
diff --git a/build.rs b/build.rs
index 23e9653..c311c53 100644
--- a/build.rs
+++ b/build.rs
@@ -40,7 +40,7 @@ fn main() {
 
     assert!(Command::new("make")
         .env("MAKEFLAGS", env::var("CARGO_MAKEFLAGS").unwrap_or_default())
-        .args(&["-R", "-f", "makefile.cargo"])
+        .args(["-R", "-f", "makefile.cargo"])
         .status()
         .unwrap()
         .success());