From 026b93b64c7288101209c89af0134ad87baae49f Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 11:28:12 -0800
Subject: [PATCH 01/12] Manual platform jobs, for faster testing.

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bff4ab5..3515ae4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,6 +46,7 @@ test:
 build:android:
   stage: build
   needs: [test]
+  when: manual
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_TAG
@@ -88,6 +89,7 @@ build:ios:
   <<: *common
   stage: build
   needs: [test]
+  when: manual
   tags:
     - mac-lab
   script:
-- 
GitLab


From 61d6c95bcba523780e978a42d9cbdfa62b0e1e9d Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 11:29:25 -0800
Subject: [PATCH 02/12] Copying example to start Saas macos.

---
 .gitlab-ci.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3515ae4b..7568777e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,3 +117,19 @@ build:ios:
     name: "fk-patina-ios-${CI_COMMIT_REF_NAME}"
     paths:
       - build/ios/ipa/*
+
+.macos_saas_runners:
+  tags:
+    - saas-macos-medium-m1
+  image: macos-12-xcode-14
+  before_script:
+    - echo "started by ${GITLAB_USER_NAME}"
+
+build:ios:saas:
+  extends:
+    - .macos_saas_runners
+  stage: build
+  script:
+    - echo "running scripts in the build job"
+
+
-- 
GitLab


From 7caa8a418251afc45f4c7e539f76df5638a558cd Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 14:40:57 -0800
Subject: [PATCH 03/12] Clone flutter SDK.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7568777e..33cc68c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,5 +131,5 @@ build:ios:saas:
   stage: build
   script:
     - echo "running scripts in the build job"
-
-
+    - git clone --depth 1 --branch 3.16.0 https://github.com/flutter/flutter.git $HOME/sdks/flutter
+    - yes | flutter doctor --android-licenses && flutter doctor && chown -R root:root $HOME/sdks/flutter
-- 
GitLab


From 17bc36abe19d42b0c50097073001a1e3ad9e517a Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 14:48:20 -0800
Subject: [PATCH 04/12] Perhaps flutter is already installed.

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33cc68c7..5bb32b43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,5 +131,4 @@ build:ios:saas:
   stage: build
   script:
     - echo "running scripts in the build job"
-    - git clone --depth 1 --branch 3.16.0 https://github.com/flutter/flutter.git $HOME/sdks/flutter
-    - yes | flutter doctor --android-licenses && flutter doctor && chown -R root:root $HOME/sdks/flutter
+    - which flutter
-- 
GitLab


From 0aaf637737d4b1da657ad3d1d1112ebe7d152d9e Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 14:50:18 -0800
Subject: [PATCH 05/12] Yep, get version and look around.

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bb32b43..98e6e591 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,3 +132,5 @@ build:ios:saas:
   script:
     - echo "running scripts in the build job"
     - which flutter
+    - flutter --version
+    - ls -alh
-- 
GitLab


From e21416fccc8f814dd8ac92929ed1dc4e576cfa42 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 14:51:08 -0800
Subject: [PATCH 06/12] New xcode 15.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98e6e591..4684f072 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ build:ios:
 .macos_saas_runners:
   tags:
     - saas-macos-medium-m1
-  image: macos-12-xcode-14
+  image: macos-14-xcode-15
   before_script:
     - echo "started by ${GITLAB_USER_NAME}"
 
-- 
GitLab


From b2d7b821f270236d7236c5037950d31c50be883d Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 14:54:28 -0800
Subject: [PATCH 07/12] Upgrade flutter in Gitlab iOS image.

I wish I could specify the version.
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4684f072..529b6703 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,4 +133,6 @@ build:ios:saas:
     - echo "running scripts in the build job"
     - which flutter
     - flutter --version
+    - flutter upgrade
+    - flutter --version
     - ls -alh
-- 
GitLab


From 895895246a0be8c89d3702e4a5d4d2f489770056 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 27 Nov 2023 10:05:21 -0800
Subject: [PATCH 08/12] Add Gemfile with fastline, vendored.

---
 .bundle/config | 2 ++
 .gitignore     | 3 +++
 Gemfile        | 3 +++
 3 files changed, 8 insertions(+)
 create mode 100644 .bundle/config
 create mode 100644 Gemfile

diff --git a/.bundle/config b/.bundle/config
new file mode 100644
index 00000000..23692288
--- /dev/null
+++ b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"
diff --git a/.gitignore b/.gitignore
index 8dabd734..cb93719d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,6 @@ rustfk
 /.env
 
 /lib/l10n/untranslated.txt
+
+/vendor
+/Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..7a118b49
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
-- 
GitLab


From c0943f2cc34fe6849ff2a66ee8af7d1b606a0554 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Thu, 18 Apr 2024 12:27:10 -0700
Subject: [PATCH 09/12] Confused, try just using the existing job.

---
 .gitlab-ci.yml | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 529b6703..0b6c5b96 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,8 +70,7 @@ build:android:
     paths:
       - build/app/outputs/flutter-apk/*.apk
 
-.setup: &common
-  image: "ghcr.io/cirruslabs/flutter:3.19.5"
+.setup: &common # image: "ghcr.io/cirruslabs/flutter:3.19.5"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_TAG
@@ -90,8 +89,9 @@ build:ios:
   stage: build
   needs: [test]
   when: manual
+  image: macos-14-xcode-15
   tags:
-    - mac-lab
+    - saas-macos-medium-m1
   script:
     - git clone https://gitlab.com/fieldkit/libraries/rustfk.git
     # BEGIN Signing
@@ -117,22 +117,3 @@ build:ios:
     name: "fk-patina-ios-${CI_COMMIT_REF_NAME}"
     paths:
       - build/ios/ipa/*
-
-.macos_saas_runners:
-  tags:
-    - saas-macos-medium-m1
-  image: macos-14-xcode-15
-  before_script:
-    - echo "started by ${GITLAB_USER_NAME}"
-
-build:ios:saas:
-  extends:
-    - .macos_saas_runners
-  stage: build
-  script:
-    - echo "running scripts in the build job"
-    - which flutter
-    - flutter --version
-    - flutter upgrade
-    - flutter --version
-    - ls -alh
-- 
GitLab


From eabf72cc3c377a09f1330c19aa09cd6baddcc183 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 20 Nov 2023 11:28:12 -0800
Subject: [PATCH 10/12] Manual platform jobs, for faster testing.

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aec62ccd..7c2f79f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,6 +109,7 @@ test:
 build:android:
   stage: build
   needs: [test]
+  when: manual
   rules:
     - if: $CI_PROJECT_NAMESPACE != 'fieldkit'
       when: never
@@ -180,6 +181,7 @@ build:ios:
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
   tags:
     - mac-lab
   script:
-- 
GitLab


From d89aac289d6b4603f2759ea5e6b3b12cec018875 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Mon, 27 Nov 2023 10:05:21 -0800
Subject: [PATCH 11/12] Add Gemfile with fastline, vendored.

---
 .bundle/config | 2 ++
 .gitignore     | 2 ++
 Gemfile        | 3 +++
 3 files changed, 7 insertions(+)
 create mode 100644 .bundle/config
 create mode 100644 Gemfile

diff --git a/.bundle/config b/.bundle/config
new file mode 100644
index 00000000..23692288
--- /dev/null
+++ b/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"
diff --git a/.gitignore b/.gitignore
index 335bee6a..e8a24ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,5 @@ app/src/test/kotlin/org/example/AppTest.kt
 
 # Diagnostics files
 diagnostics-*.txt
+/vendor
+/Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..7a118b49
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
-- 
GitLab


From 664ad30f62f2ae7f51f2733a8eb2ed94a53caeb6 Mon Sep 17 00:00:00 2001
From: Jacob Lewallen <jlewallen@gmail.com>
Date: Thu, 18 Apr 2024 12:27:10 -0700
Subject: [PATCH 12/12] Confused, try just using the existing job.

---
 .gitlab-ci.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c2f79f5..9e290b95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -161,7 +161,11 @@ upload:android:
     - cd android && ./gradlew publishBundle
 
 .setup: &common
-  image: "ghcr.io/cirruslabs/flutter:3.32.8"
+  image: "ghcr.io/cirruslabs/flutter:3.19.5"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   before_script:
     # BEGIN Rust
     - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh
@@ -182,8 +186,9 @@ build:ios:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
     - if: $CI_COMMIT_BRANCH == "main"
   when: manual
+  image: macos-14-xcode-15
   tags:
-    - mac-lab
+    - saas-macos-medium-m1
   script:
     # BEGIN Signing
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
-- 
GitLab