diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 0ec3c7f..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,138 +0,0 @@ -version: 2.1 - -orbs: - codecov: codecov/codecov@3 - -executors: - macos-executor: - parameters: - xcode: - type: string - shell: /bin/bash --login -eo pipefail - macos: - xcode: << parameters.xcode >> - environment: - LC_ALL: en_US.UTF-8 - LANG: en_US.UTF-8 - BUNDLE_JOBS: 4 - BUNDLE_RETRY: 3 - BUNDLE_PATH: vendor/bundle - HOMEBREW_LOGS: ~/homebrew-logs - HOMEBREW_TEMP: ~/homebrew-temp - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - FL_OUTPUT_DIR: output - FASTLANE_EXPLICIT_OPEN_SIMULATOR: 2 - -commands: - prepare: - parameters: - scheme: - type: string - steps: - - restore_cache: - keys: - - << parameters.scheme >>-v1-gems-{{ checksum "Gemfile.lock" }} - - run: - name: Install gems - command: bundle check || bundle install --without=development - - save_cache: - key: << parameters.scheme >>-v1-gems-{{ checksum "Gemfile.lock" }} - paths: - - vendor/bundle - - run: - name: Save Xcode version - command: xcodebuild -version | tee .xcode-version - - restore_cache: - keys: - - << parameters.scheme >>-v1-carthage-{{ checksum "Cartfile.resolved" }}-{{ checksum ".xcode-version" }} - - run: - name: Install dependencies - command: carthage bootstrap --use-xcframeworks --no-use-binaries --cache-builds - - save_cache: - key: << parameters.scheme >>-v1-carthage-{{ checksum "Cartfile.resolved" }}-{{ checksum ".xcode-version" }} - paths: - - Carthage/Build - test-ios: - parameters: - scheme: - type: string - steps: - - run: - name: Run iOS tests - command: bundle exec fastlane ios ci - - run: - name: Generate coverage report - command: bundle exec slather coverage -x --output-directory output --arch x86_64 --scheme << parameters.scheme >>-iOS << parameters.scheme >>.xcodeproj - - codecov/upload: - file: output/cobertura.xml - - run: - name: Run pod lib lint - command: bundle exec fastlane ios pod_lint - - store_test_results: - path: output/scan - - store_artifacts: - path: output - test-macos: - parameters: - scheme: - type: string - steps: - - run: - name: Run macOS tests - command: | - xcodebuild test -scheme << parameters.scheme >>-macOS -destination 'platform=macOS,arch=x86_64' | xcpretty - swift test - test-tvos: - parameters: - scheme: - type: string - steps: - - run: - name: Run tvOS tests - command: xcodebuild test -scheme << parameters.scheme >>-tvOS -destination 'platform=tvOS Simulator,name=Apple TV' | xcpretty - -jobs: - build-and-test: - parameters: - platform: - type: string - xcode: - type: string - scheme: - type: string - executor: - name: macos-executor - xcode: << parameters.xcode >> - steps: - - checkout - - prepare: - scheme: << parameters.scheme >> - - when: - condition: - equal: [ios, << parameters.platform >>] - steps: - - test-ios: - scheme: << parameters.scheme >> - - when: - condition: - equal: [macos, << parameters.platform >>] - steps: - - test-macos: - scheme: << parameters.scheme >> - - when: - condition: - equal: [tvos, << parameters.platform >>] - steps: - - test-tvos: - scheme: << parameters.scheme >> - -workflows: - build: - jobs: - - build-and-test: - scheme: SimpleKeychain - matrix: - parameters: - platform: [ios, macos, tvos] - xcode: ['14.2.0'] diff --git a/README.md b/README.md index 03addd3..8e217b1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![SimpleKeychain](https://cdn.auth0.com/website/sdks/banners/simplekeychain-banner.png) ![Version](https://img.shields.io/cocoapods/v/SimpleKeychain.svg?style=flat) -[![CircleCI](https://img.shields.io/circleci/project/github/auth0/SimpleKeychain.svg?style=flat)](https://circleci.com/gh/auth0/SimpleKeychain/tree/master) +![Build Status](https://img.shields.io/github/actions/workflow/status/auth0/SimpleKeychain/main.yml?style=flat) [![Coverage Status](https://img.shields.io/codecov/c/github/auth0/SimpleKeychain/master.svg?style=flat)](https://codecov.io/github/auth0/SimpleKeychain) ![License](https://img.shields.io/github/license/auth0/SimpleKeychain.svg?style=flat) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9db90a6..c9a196d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,34 +1,6 @@ default_platform :ios platform :ios do - before_all do - setup_circle_ci - end - - desc 'Runs all the tests' - lane :test do |options| - scheme = options[:scheme] - device = options[:device] - scan( - scheme: scheme, - device: device, - clean: true, - skip_build: true, - output_types: 'junit' - ) - end - - desc 'Cocoapods library lint' - lane :pod_lint do - pod_lib_lint(verbose: false, allow_warnings: true, platforms: 'ios,osx,tvos') - end - - desc 'Runs all the tests in a CI environment' - lane :ci do - # TODO: Run rest of platforms - test - end - desc 'Tags the release and pushes the Podspec to CocoaPods' lane :release do perform_release target: 'SimpleKeychain-iOS' diff --git a/fastlane/README.md b/fastlane/README.md index 0786b3b..2a95c96 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -15,30 +15,6 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do ## iOS -### ios test - -```sh -[bundle exec] fastlane ios test -``` - -Runs all the tests - -### ios pod_lint - -```sh -[bundle exec] fastlane ios pod_lint -``` - -Cocoapods library lint - -### ios ci - -```sh -[bundle exec] fastlane ios ci -``` - -Runs all the tests in a CI environment - ### ios release ```sh diff --git a/fastlane/Scanfile b/fastlane/Scanfile deleted file mode 100644 index af79e58..0000000 --- a/fastlane/Scanfile +++ /dev/null @@ -1,4 +0,0 @@ -scheme "SimpleKeychain-iOS" -devices ["iPhone 12"] - -clean true