Merge branch 'develop' into feature/serialization

This commit is contained in:
Christian Treffs 2020-08-20 18:45:10 +02:00
commit ea76df0e8c
No known key found for this signature in database
GPG Key ID: 49A4B4B460BE3ED4
5 changed files with 30 additions and 28 deletions

View File

@ -14,15 +14,23 @@ jobs:
xcode: ["11.6", "12_beta"]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@master
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Swift version
run: swift --version
- name: Test
run: swift test --skip-update --parallel --enable-test-discovery
run: swift test -v --skip-update --parallel --enable-test-discovery --enable-code-coverage
env:
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
- name: Generate coverage report
run: xcrun llvm-cov export -format="lcov" .build/debug/*PackageTests.xctest/Contents/MacOS/*PackageTests -instr-profile .build/debug/codecov/default.profdata > coverage.lcov
- name: Upload code coverage report
uses: codecov/codecov-action@v1
with:
token: ${{secrets.CODECOV_TOKEN}}
file: coverage.lcov
fail_ci_if_error: true
- name: Build Release
run: swift build -c release
env:
@ -37,19 +45,34 @@ jobs:
image: swift:${{ matrix.swift }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@master
- name: "Update APT"
shell: bash
run: "apt update"
- name: "Install curl"
shell: bash
run: "apt-get install -y curl"
- name: Swift version
run: swift --version
- name: Test
run: swift test --skip-update --parallel --enable-test-discovery
run: swift test -v --skip-update --parallel --enable-test-discovery --enable-code-coverage
- name: Generate coverage report
run: llvm-cov export -format="lcov" .build/debug/*PackageTests.xctest -instr-profile .build/debug/codecov/default.profdata > coverage.lcov
- name: Upload code coverage report
uses: codecov/codecov-action@v1
with:
token: ${{secrets.CODECOV_TOKEN}}
file: coverage.lcov
fail_ci_if_error: true
- name: Build Release
run: swift build -c release
webAssembly:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@master
- name: Swift version
run: swift --version
- name: Build

View File

@ -1,20 +0,0 @@
os:
- linux
- osx
language: generic
sudo: required
dist: bionic
osx_image: xcode11
env: SWIFT_VERSION=5.1
install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"; fi
script:
- swift package reset
- swift build
- swift test --enable-code-coverage
- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then xcrun llvm-cov show -instr-profile=.build/debug/codecov/default.profdata .build/debug/FirebladeECSPackageTests.xctest/Contents/MacOS/FirebladeECSPackageTests > fireblade_ecs_coverage.txt; fi
after_success:
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
bash <(curl -s https://codecov.io/bash);
fi

View File

@ -1,6 +1,5 @@
# Fireblade ECS (Entity-Component System)
[![github CI](https://github.com/fireblade-engine/ecs/workflows/CI/badge.svg)](https://github.com/fireblade-engine/ecs/actions?query=workflow%3ACI)
[![travis CI](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.1+-brightgreen.svg)](https://swift.org)
[![platforms](https://img.shields.io/badge/platforms-%20macOS%20|%20iOS%20|%20tvOS%20|%20watchOS-brightgreen.svg)](#)

View File

@ -1,4 +1,4 @@
// Generated using Sourcery 0.18.0 https://github.com/krzysztofzablocki/Sourcery
// Generated using Sourcery 1.0.0 https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT
// swiftlint:disable file_length

View File

@ -1,4 +1,4 @@
// Generated using Sourcery 0.18.0 https://github.com/krzysztofzablocki/Sourcery
// Generated using Sourcery 1.0.0 https://github.com/krzysztofzablocki/Sourcery
// DO NOT EDIT
import FirebladeECS