Remove watchOS scheme and add job to run tests on Linux

gonzalezreal · Oct 8, 2021 · c17d8df · c17d8df
1 parent 672f7a7
commit c17d8df
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 83 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,11 +7,17 @@ on:
  branches:
  - '*'
 jobs:
- tests:
- runs-on: macos-11.0
+ test-swift:
+ runs-on: macos-11
  steps:
  - uses: actions/checkout@v2
  - name: Select Xcode 12.5
  run: sudo xcode-select -s /Applications/Xcode_12.5.app
  - name: Run tests
- run: make
+ run: make test-swift
+ test-linux:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Run tests
+ run: make test-linux
diff --git a/.spi.yml b/.spi.yml
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SwiftCommonMark-watchOS.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SwiftCommonMark-watchOS.xcscheme
diff --git a/Makefile b/Makefile
@@ -1,14 +1,19 @@
-default: test build_watchOS
+test-all: test-linux test-swift
 
-test:
- swift test
+test-linux:
+ docker run \
+ --rm \
+ -v "$(PWD):$(PWD)" \
+ -w "$(PWD)" \
+ swift:5.3 \
+ bash -c 'make test-swift'
 
-build_watchOS:
- xcodebuild \
-  -scheme SwiftCommonMark-watchOS \
-  -destination 'generic/platform=watchOS'
+test-swift:
+ swift test \
+ --enable-test-discovery \
+ --parallel
 
 format:
  swift format --in-place --recursive .
 
-.PHONY: format
+.PHONY: format test-all test-linux test-swift