From a340c7152bba3e200525be9c6cac76d160819d76 Mon Sep 17 00:00:00 2001 From: Michael Rademaker Date: Wed, 6 Aug 2025 11:40:11 +0200 Subject: [PATCH 1/5] ci: add PR and manual workflow triggers for CI pipeline. openremote/openremote#16 --- .github/workflows/ci_cd.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 8408cb3..fac8bbd 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -8,6 +8,14 @@ on: tags-ignore: - '*.*' + # PR + pull_request: + branches: + - 'main' + + # Manual trigger + workflow_dispatch: + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true From 7af2a7b3cecf1d2bbc988abe386043c49e319c1e Mon Sep 17 00:00:00 2001 From: Michael Rademaker Date: Wed, 6 Aug 2025 12:04:55 +0200 Subject: [PATCH 2/5] fix: enable provisioning updates in CI --- .github/workflows/ci_cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index fac8bbd..4133976 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -79,6 +79,7 @@ jobs: -sdk iphoneos \ -configuration Release \ -destination generic/platform=iOS \ + -allowProvisioningUpdates \ clean archive # - name: Export IPA From 787f2c9a6d6e1e20684f2203ddd1ddd3d73e4b88 Mon Sep 17 00:00:00 2001 From: Michael Rademaker Date: Wed, 6 Aug 2025 13:07:06 +0200 Subject: [PATCH 3/5] reverted provisioning update flag from build --- .github/workflows/ci_cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 4133976..fac8bbd 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -79,7 +79,6 @@ jobs: -sdk iphoneos \ -configuration Release \ -destination generic/platform=iOS \ - -allowProvisioningUpdates \ clean archive # - name: Export IPA From 0eb605b68696509ac33d3f7b7d7b91f09e6e88a5 Mon Sep 17 00:00:00 2001 From: Michael Rademaker Date: Wed, 6 Aug 2025 13:34:07 +0200 Subject: [PATCH 4/5] refactor: replace async with Task.init and simplify error handling in domain config --- GenericApp/GenericApp/UI/WizardDomainViewController.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/GenericApp/GenericApp/UI/WizardDomainViewController.swift b/GenericApp/GenericApp/UI/WizardDomainViewController.swift index e2235a8..74bfe48 100644 --- a/GenericApp/GenericApp/UI/WizardDomainViewController.swift +++ b/GenericApp/GenericApp/UI/WizardDomainViewController.swift @@ -102,10 +102,10 @@ extension WizardDomainViewController: UITextFieldDelegate { } fileprivate func requestAppConfig(_ domain: String) { - async { + Task.init { do { configManager = ConfigManager(apiManagerFactory: { url in - try HttpApiManager(baseUrl: url) + HttpApiManager(baseUrl: url) }) let state = try await configManager!.setDomain(domain: domain) @@ -124,10 +124,6 @@ extension WizardDomainViewController: UITextFieldDelegate { case.complete: self.performSegue(withIdentifier: Segues.goToWebView, sender: self) } - } catch ApiManagerError.invalidUrl { - let alertView = UIAlertController(title: "Error", message: "Invalid domain.\nCheck your input and try again.", preferredStyle: .alert) - alertView.addAction(UIAlertAction(title: "OK", style: .default, handler: nil)) - self.present(alertView, animated: true, completion: nil) } catch { let alertView = UIAlertController(title: "Error", message: "Error occurred getting app config.\nCheck your input and try again.", preferredStyle: .alert) alertView.addAction(UIAlertAction(title: "OK", style: .default, handler: nil)) From 351c897fc8053d0fe3e8d3ec26f5670f256ac07c Mon Sep 17 00:00:00 2001 From: Michael Rademaker Date: Wed, 6 Aug 2025 13:48:45 +0200 Subject: [PATCH 5/5] ci: pin macOS runner version to macos-15 for CI/CD workflow --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index fac8bbd..8525b54 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -24,7 +24,7 @@ jobs: build: name: CI/CD - runs-on: macos-latest + runs-on: macos-15 # is not the macos-latest, which should be by the end of August 2025 steps: - name: Checkout