From 63c6476065fcb4023e3fedb7b6bfde877b4be1ef Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 21:19:48 +0200 Subject: [PATCH 1/6] Remove travis-ci --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c49c209..0000000 --- a/.travis.yml +++ /dev/null @@ -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 \ No newline at end of file From 27d88fe4e2548f3d29155a8e22099e9960fd69e9 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 21:20:08 +0200 Subject: [PATCH 2/6] Add code coverage to github-ci --- .github/workflows/ci.yml | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17f2971..43f8b19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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,28 @@ jobs: image: swift:${{ matrix.swift }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@master - 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 From afdfebce5538e3f4cc632ced5a9302d38797c03d Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 21:35:58 +0200 Subject: [PATCH 3/6] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43f8b19..59bb823 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,8 @@ jobs: container: image: swift:${{ matrix.swift }} steps: + - name: Install curl + uses: wei/curl@v1.1.1 - name: Checkout uses: actions/checkout@master - name: Swift version From c6ba65b6c00c3f0e1ffb7664eae2948941f0c972 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 21:42:27 +0200 Subject: [PATCH 4/6] Update ci.yml --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59bb823..014c779 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,10 +44,11 @@ jobs: container: image: swift:${{ matrix.swift }} steps: - - name: Install curl - uses: wei/curl@v1.1.1 - name: Checkout uses: actions/checkout@master + - name: "Install curl" + shell: bash + run: "apt-get install -y curl" - name: Swift version run: swift --version - name: Test From e00e125a84eb5d70fc8678841919e5ccbdc8dc54 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 21:54:35 +0200 Subject: [PATCH 5/6] Update ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 014c779..39ec527 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@master + - name: "Update APT" + shell: bash + run: "apt update" - name: "Install curl" shell: bash run: "apt-get install -y curl" From fc783891873a3804d818351fe3a1429106485055 Mon Sep 17 00:00:00 2001 From: Christian Treffs Date: Wed, 12 Aug 2020 22:00:59 +0200 Subject: [PATCH 6/6] Update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b3633cf..a5406c2 100644 --- a/README.md +++ b/README.md @@ -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)](#)