From 7ebcd99ad765df98493627efa66a79c79b3fa886 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Thu, 30 Apr 2020 20:07:42 +0200 Subject: [PATCH] Update CI + cleanups --- .gitignore | 1 - .gitlab-ci.yml | 2 +- .swift-version | 2 +- .travis.yml | 12 +----------- README.md | 4 ++-- 5 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 3572c28..58f4b72 100644 --- a/.gitignore +++ b/.gitignore @@ -46,7 +46,6 @@ fastlane/test_output Gemfile* Icon Network Trash Folder -Package.resolved Packages playground.xcworkspace Temporary Items diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5770440..863f3c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: swift:5.0 +image: swift:5.2.2 #before_script: #- eval "$(curl -sL https://swiftenv.fuller.li/install.sh)" diff --git a/.swift-version b/.swift-version index 50e2274..ce7f2b4 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -5.0.3 +5.2.2 diff --git a/.travis.yml b/.travis.yml index c989ccd..d17894a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,4 @@ script: - swift package reset - swift build - swift test -env: - - BADGE=linux - - BADGE=osx -# hack to get some OS-specific badges -# see: https://github.com/travis-ci/travis-ci/issues/9579 -matrix: - exclude: - - os: linux - env: BADGE=osx - - os: osx - env: BADGE=linux + \ No newline at end of file diff --git a/README.md b/README.md index d3eb348..584e821 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Fireblade ECS (Entity-Component System) [![Build Status](https://travis-ci.com/fireblade-engine/ecs.svg?branch=master)](https://travis-ci.com/fireblade-engine/ecs) [![license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE) -[![swift version](https://img.shields.io/badge/swift-5.0+-brightgreen.svg)](https://swift.org/download) +[![swift version](https://img.shields.io/badge/swift-5+-brightgreen.svg)](https://swift.org/download) [![platforms](https://img.shields.io/badge/platforms-%20macOS%20|%20iOS%20|%20tvOS%20|%20watchOS-brightgreen.svg)](#) [![platforms](https://img.shields.io/badge/platforms-linux-brightgreen.svg)](#) @@ -21,7 +21,7 @@ These instructions will get you a copy of the project up and running on your loc ### 💻 Installing -Fireblade ECS is available for all platforms that support [Swift 5.0](https://swift.org/) and higher and the [Swift Package Manager (SPM)](https://github.com/apple/swift-package-manager). +Fireblade ECS is available for all platforms that support [Swift 5](https://swift.org/) and higher and the [Swift Package Manager (SPM)](https://github.com/apple/swift-package-manager). Extend the following lines in your `Package.swift` file or use it to create a new project.