From d2feb98edadb736462909e30b91eb4d2ab8e4888 Mon Sep 17 00:00:00 2001
From: Vishnu Ravi <vishnur@stanford.edu>
Date: Fri, 16 Aug 2024 15:37:04 -0400
Subject: [PATCH] Update CI scripts (#44)

---
 .github/workflows/beta-deployment.yml | 36 ---------------------------
 .github/workflows/build-and-test.yml  |  3 +++
 LifeSpace.xcodeproj/project.pbxproj   |  6 ++---
 3 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 .github/workflows/beta-deployment.yml

diff --git a/.github/workflows/beta-deployment.yml b/.github/workflows/beta-deployment.yml
deleted file mode 100644
index 496a8be..0000000
--- a/.github/workflows/beta-deployment.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# This source file is part of LifeSpace based on the Stanford Spezi Template Application project
-#
-# SPDX-FileCopyrightText: 2023 Stanford University
-#
-# SPDX-License-Identifier: MIT
-#
-
-name: Beta Deployment
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  buildandtest:
-    name: Build and Test
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Add Mapbox credentials
-        uses: extractions/netrc@v1
-        with:
-          machine: api.mapbox.com
-          username: mapbox
-          password: ${{ secrets.MAPBOX_TOKEN }}
-      - name: Write Mapbox credentials to file for Xcode build
-        run: echo "${{ secrets.MAPBOX_TOKEN }}" > .mapbox
-      - name: Set up Xcode
-        uses: maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '15.4'
-      - name: Build and Test
-        run: set -o pipefail && xcodebuild test -project LifeSpace.xcodeproj -scheme LifeSpace -destination 'platform=iOS Simulator,name=iPhone 15 Pro' | xcpretty
\ No newline at end of file
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 639053f..8b327f1 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -9,6 +9,9 @@
 name: Build and Test
 
 on:
+  push:
+    branches:
+      - main
   pull_request:
   workflow_dispatch:
   workflow_call:
diff --git a/LifeSpace.xcodeproj/project.pbxproj b/LifeSpace.xcodeproj/project.pbxproj
index 4be71c4..ba92f3e 100644
--- a/LifeSpace.xcodeproj/project.pbxproj
+++ b/LifeSpace.xcodeproj/project.pbxproj
@@ -792,7 +792,7 @@
 				CODE_SIGN_ENTITLEMENTS = "LifeSpace/Supporting Files/LifeSpace.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -996,7 +996,7 @@
 				CODE_SIGN_ENTITLEMENTS = "LifeSpace/Supporting Files/LifeSpace.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -1044,7 +1044,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 21;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = "";