diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
new file mode 100644
index 0000000..7053112
--- /dev/null
+++ b/.github/workflows/build-test.yml
@@ -0,0 +1,22 @@
+name: Swift
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Force Xcode 11
+        run: sudo xcode-select -switch /Applications/Xcode_11.3.app
+
+      - name: Run tests
+        run: xcodebuild clean test -project "MTMR.xcodeproj" -scheme "UnitTests"
+
+      - name: Build Archive
+        run: xcodebuild archive -project "MTMR.xcodeproj" -scheme "MTMR" -archivePath Release/App.xcarchive
+
+      - name: Build App
+        run: xcodebuild -project "MTMR.xcodeproj" -exportArchive -archivePath Release/App.xcarchive -exportOptionsPlist export-options.plist -exportPath Release
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
deleted file mode 100644
index 2e76632..0000000
--- a/.github/workflows/swift.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Swift
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: macOS-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Build
-      run: swift build -v
-    - name: Run tests
-      run: swift test -v